diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-31 00:02:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-31 00:02:30 +0000 |
| commit | 5b3474881a154216b47c6e154552ee5f9c68c509 (patch) | |
| tree | 098f24750e89f88b3c80ded4579a44928bae1b45 | |
| parent | 4982c269b318734d01ad30c6592fbb73565ceb12 (diff) | |
Tue Jul 31 00:02:29 UTC 2012
83 files changed, 2072 insertions, 238 deletions
diff --git a/community-staging/krename/PKGBUILD b/community-staging/krename/PKGBUILD new file mode 100644 index 000000000..0a5454aab --- /dev/null +++ b/community-staging/krename/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 74533 2012-07-30 01:30:20Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=krename +pkgver=4.0.9 +pkgrel=2 +pkgdesc="A very powerfull batch file renamer for KDE" +arch=('i686' 'x86_64') +url="http://www.krename.net" +license=('GPL') +depends=('kdebase-runtime' 'taglib') +makedepends=('cmake' 'automoc4') +options=('libtool') +install=krename.install +source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/krename/krename.install b/community-staging/krename/krename.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/community-staging/krename/krename.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/libgexiv2/PKGBUILD b/community-staging/libgexiv2/PKGBUILD new file mode 100644 index 000000000..c37d9d27f --- /dev/null +++ b/community-staging/libgexiv2/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 74535 2012-07-30 01:39:07Z ebelanger $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libgexiv2 +pkgver=0.4.1 +pkgrel=3 +pkgdesc="GObject-based wrapper around the Exiv2 library." +arch=('i686' 'x86_64') +url="http://redmine.yorba.org/projects/gexiv2" +license=('GPL2') +depends=('exiv2' 'glib2') +options=('!libtool') +source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/cegui/PKGBUILD b/community-testing/cegui/PKGBUILD index ab3c7c76a..3d0514fb2 100644 --- a/community-testing/cegui/PKGBUILD +++ b/community-testing/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73749 2012-07-15 13:18:03Z ibiru $ +# $Id: PKGBUILD 74509 2012-07-29 21:15:11Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.6 -pkgrel=4 +pkgrel=5 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" diff --git a/community-testing/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD new file mode 100644 index 000000000..4fcbe0b25 --- /dev/null +++ b/community-testing/freewrl/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 74511 2012-07-29 21:15:25Z ebelanger $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=freewrl +pkgver=1.22.13 +pkgrel=2 +pkgdesc="VRML viewer" +arch=('i686' 'x86_64') +url="http://freewrl.sourceforge.net/" +license=('GPL') +depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') +makedepends=('java-environment' 'xulrunner') +options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('7e432c7a9eb5d00497d34d93e2b4d420') + +build() { + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh + cd $srcdir/$pkgname-$pkgver + export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" + export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" + ./configure \ + --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ + --enable-libcurl --with-expat=/usr --with-target=x11 --enable-plugin \ + --disable-mozilla-js --enable-xulrunner-js --disable-firefox-js \ + --disable-seamonkey-js + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD index cff855dc6..4a990ca65 100644 --- a/community-testing/gambas3/PKGBUILD +++ b/community-testing/gambas3/PKGBUILD @@ -1,47 +1,42 @@ -# $Id: PKGBUILD 72913 2012-06-24 19:24:03Z foutrelis $ +# $Id: PKGBUILD 74513 2012-07-29 21:15:40Z ebelanger $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor : sebikul <sebikul@gmail.com> pkgbase=gambas3 pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' - 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' - 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' - 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.1.1 -pkgrel=4 + 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media' + 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' + 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' + 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' + 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' + 'gambas3-gb-xml-xslt' 'gambas3-gb-web') +pkgver=3.2.1 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" -license=('GPL') +license=('GPL2') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl') + 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install' - 'poppler-0-20.patch') -md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' + 'gambas3-script.install' 'gambas3-runtime.install') +md5sums=('e7aed820300ff8599e9f74029984f793' 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29' - '39d2ae1e2096a29df7857fce083eafaf') + '6d9e080b66443e7246387b1716d24e31') build() { cd ${srcdir}/${pkgbase}-${pkgver} - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np1 -i ../../poppler-0-20.patch - cd .. - ./reconf-all ./configure --prefix=/usr -C @@ -51,6 +46,8 @@ build() { package_gambas3-runtime() { depends=('libffi' 'xdg-utils') pkgdesc="Runtime environment" + conflicts=('gambas3-gb-gui') + replaces=('gambas3-gb-gui') install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc @@ -79,9 +76,23 @@ package_gambas3-runtime() { install -d -m755 ${pkgdir}/usr/share/gambas3/icons install -D -m644 mime/application-x-gambas3.png \ ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png - - cd gbc + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc make DESTDIR="${pkgdir}" uninstall + ## } package_gambas3-devel() { @@ -136,7 +147,7 @@ package_gambas3-examples() { depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' @@ -429,7 +440,7 @@ package_gambas3-gb-eval-highlight() { } package_gambas3-gb-form() { - depends=('gambas3-gb-gui') + depends=('gambas3-runtime') pkgdesc="Form component" ## Workaround for splitting @@ -552,6 +563,9 @@ package_gambas3-gb-gtk() { cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk make XDG_UTILS='' DESTDIR="${pkgdir}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -559,16 +573,16 @@ package_gambas3-gb-gtk() { ## } -package_gambas3-gb-gsl() { - depends=('gambas3-runtime' 'gsl') - pkgdesc="The GNU Scientific Library component" +package_gambas3-gb-gtk-opengl() { + depends=('gambas3-gb-gtk' 'gtkglext') + pkgdesc="GTK+ toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround @@ -577,26 +591,21 @@ package_gambas3-gb-gsl() { ## } -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Automatic gui toolkit chooser" +package_gambas3-gb-gsl() { + depends=('gambas3-runtime' 'gsl') + pkgdesc="The GNU Scientific Library component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install ## - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} ## } @@ -668,6 +677,60 @@ package_gambas3-gb-image-io() { ## } +package_gambas3-gb-jit() { + depends=('gambas3-runtime' 'llvm') + pkgdesc="Just-in-time compiler for gambas" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-media() { + depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') + pkgdesc="Simplified interface to the GStreamer library" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.media + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-ncurses() { + depends=('gambas3-runtime' 'ncurses') + pkgdesc="Ncurses component for gambas" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + package_gambas3-gb-net() { depends=('gambas3-runtime') pkgdesc="Network component" @@ -1042,7 +1105,7 @@ package_gambas3-gb-vb() { } package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') + depends=('gambas3-runtime') pkgdesc="XML component" ## workaround for splitting @@ -1054,17 +1117,40 @@ package_gambas3-gb-xml() { make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-xml-html() { + depends=('gambas3-gb-xml') + pkgdesc="HTML generator component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall ## } package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') + depends=('gambas3-gb-xml' 'gambas3-gb-net-curl') pkgdesc="XML-RPC component" ## workaround for splitting @@ -1076,6 +1162,7 @@ package_gambas3-gb-xml-rpc() { make XDG_UTILS='' DESTDIR="${pkgdir}" install ## + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml make XDG_UTILS='' DESTDIR="${pkgdir}" install @@ -1086,8 +1173,10 @@ package_gambas3-gb-xml-rpc() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} + rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]* + rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]* + rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]* + rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.* ## } @@ -1128,3 +1217,4 @@ package_gambas3-gb-web() { rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* ## } + diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install index 6c8201a6a..cfb5812fe 100644 --- a/community-testing/gambas3/gambas3-runtime.install +++ b/community-testing/gambas3/gambas3-runtime.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 + /usr/share/gambas3/mime/application-x-gambas3.png application-x-gambas3 xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml } diff --git a/community-testing/gource/PKGBUILD b/community-testing/gource/PKGBUILD index 20e092692..46bfbd63b 100644 --- a/community-testing/gource/PKGBUILD +++ b/community-testing/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73758 2012-07-15 13:18:51Z ibiru $ +# $Id: PKGBUILD 74514 2012-07-29 21:15:44Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.38 -pkgrel=2 +pkgrel=3 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community-testing/ifuse/PKGBUILD b/community-testing/ifuse/PKGBUILD new file mode 100644 index 000000000..7dd5e5bdf --- /dev/null +++ b/community-testing/ifuse/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 74531 2012-07-29 23:18:52Z tomegun $ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=ifuse +pkgver=1.1.2 +pkgrel=2 +pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' +url='http://libimobiledevice.org/' +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libimobiledevice' 'fuse') +source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") +md5sums=('4152526b2ac3c505cb41797d997be14d') + +build() { + cd "${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/megaglest/PKGBUILD b/community-testing/megaglest/PKGBUILD new file mode 100644 index 000000000..2740642d2 --- /dev/null +++ b/community-testing/megaglest/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 74516 2012-07-29 21:15:52Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> + +pkgname=megaglest +pkgver=3.6.0.3 +pkgrel=3 +pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/megaglest/" +license=('GPL3') +depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' +'libircclient' 'miniupnpc' 'wxgtk') +makedepends=('ftjam' 'cmake' 'mesa') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" + lol.patch) +md5sums=('5a4a2429435031d9f9cc5d9535a9de9d' + '68fd326b73ed1c75981004fbdef6b73a') + +build() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + + patch -Np1 < $srcdir/lol.patch + + [[ -d build ]] && rm -r build + mkdir build && cd build + cmake .. \ + -DWANT_SVN_STAMP=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + make +} + +package() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + + cd build + make DESTDIR="$pkgdir" install +} + +# vim: sw=2:ts=2 et: diff --git a/community-testing/megaglest/lol.patch b/community-testing/megaglest/lol.patch new file mode 100644 index 000000000..56f94c852 --- /dev/null +++ b/community-testing/megaglest/lol.patch @@ -0,0 +1,43 @@ +diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h +index 8fcfb27..3cb7a41 100644 +--- a/source/shared_lib/include/graphics/math_util.h ++++ b/source/shared_lib/include/graphics/math_util.h +@@ -184,10 +184,10 @@ public: + + Rect2<T> computeBoundingRect() const{ + return Rect2i( +- min(p[0].x, p[1].x), +- min(p[0].y, p[2].y), +- max(p[2].x, p[3].x), +- max(p[1].y, p[3].y)); ++ std::min(p[0].x, p[1].x), ++ std::min(p[0].y, p[2].y), ++ std::max(p[2].x, p[3].x), ++ std::max(p[1].y, p[3].y)); + } + + bool isInside(const Vec2<T> &pt) const{ +diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp +index b09c972..ddebd03 100644 +--- a/source/shared_lib/sources/platform/posix/ircclient.cpp ++++ b/source/shared_lib/sources/platform/posix/ircclient.cpp +@@ -13,6 +13,7 @@ + #include "ircclient.h" + #include "util.h" + #include "platform_common.h" ++#include "libirc_rfcnumeric.h" + #include "libircclient.h" + + #include <stdio.h> +diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp +index 05478fc..c27aa62 100644 +--- a/source/shared_lib/sources/util/util.cpp ++++ b/source/shared_lib/sources/util/util.cpp +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <time.h> + #include <fcntl.h> // for open() ++#include <unistd.h> + + #ifdef WIN32 + #include <io.h> // for open() diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD index 5a2e49e6a..a2bda3f75 100644 --- a/community-testing/openimageio/PKGBUILD +++ b/community-testing/openimageio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73765 2012-07-15 13:19:33Z ibiru $ +# $Id: PKGBUILD 74517 2012-07-29 21:15:55Z ebelanger $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('fa6e3f4be98d8e1868b389410b56563a') +md5sums=('7d8ee962f29cea749d02ab992e2874df') build() { cd "$srcdir"/$_pkgname*/src diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD index b074d1212..72d7611a3 100644 --- a/community-testing/performous/PKGBUILD +++ b/community-testing/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73766 2012-07-15 13:19:44Z ibiru $ +# $Id: PKGBUILD 74518 2012-07-29 21:16:06Z ebelanger $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=15 +pkgrel=16 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" diff --git a/community-testing/projectm/PKGBUILD b/community-testing/projectm/PKGBUILD new file mode 100644 index 000000000..5c8e90f15 --- /dev/null +++ b/community-testing/projectm/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 74519 2012-07-29 21:16:13Z ebelanger $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=projectm +pkgver=2.0.1 +pkgrel=6 +pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' +arch=('i686' 'x86_64') +url='http://projectm.sourceforge.net/' +license=('LGPL') +depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') +makedepends=('pkg-config' 'cmake') +source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" + 'libprojectM-2.0.1-pkg-config.patch' + 'libprojectM-2.0.1-fix-linking.patch') +md5sums=('f8bf795878cdbbef54784cf2390b4c89' + '4f258f4e7c2ab612931936bfd7f1f0fb' + '5c178cadf1e00ee4baf32cd9ccbc818c') + +build() { + cd "${srcdir}/projectM-${pkgver}-Source" + + patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch" + patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch" + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/projectM-${pkgver}-Source" + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch b/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch new file mode 100644 index 000000000..23d8a7b9a --- /dev/null +++ b/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch @@ -0,0 +1,23 @@ +--- a/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 ++++ b/CMakeLists.txt 2012-02-23 04:30:51.000000000 +0100 +@@ -177,10 +177,10 @@ + LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) + + if(BUILD_PROJECTM_STATIC) +- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) ++ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES}) + else(BUILD_PROJECTM_STATIC) + +-TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) ++TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} ) + + endif(BUILD_PROJECTM_STATIC) + +--- a/Renderer/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 ++++ b/Renderer/CMakeLists.txt 2012-02-23 04:31:58.000000000 +0100 +@@ -13,4 +13,4 @@ + INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR}) + ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) + SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2) +-TARGET_LINK_LIBRARIES(Renderer m) ++TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES}) diff --git a/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch b/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch new file mode 100644 index 000000000..b5e38205a --- /dev/null +++ b/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch @@ -0,0 +1,10 @@ +--- a/libprojectM.pc.in 2009-12-06 02:42:51.000000000 +0100 ++++ b/libprojectM.pc.in 2012-02-21 16:48:36.000000000 +0100 +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@LIB_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_PREFIX@/lib + includedir=@CMAKE_INSTALL_PREFIX@/include + pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ + sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ diff --git a/community-testing/rss-glx/PKGBUILD b/community-testing/rss-glx/PKGBUILD new file mode 100644 index 000000000..1d106b1ff --- /dev/null +++ b/community-testing/rss-glx/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 74520 2012-07-29 21:16:20Z 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=9 +pkgdesc="The Really Slick Screensavers port to GLX" +arch=('i686' 'x86_64') +url="http://rss-glx.sourceforge.net/" +license=('GPL') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +optdepends=('xscreensaver: xscreensaver integration') +install=rss-glx.install +options=('!libtool') +source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2 + rss-glx-desktops.tar.bz2) +md5sums=('a772bd143cd8d141edf4d9eff9860ab3' + '4211215c9a4918b0dff30a7000647dd9') + +build() { + cd ${srcdir}/${pkgname}_${pkgver} + + [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --program-transform-name='s/plasma/plasma_rss/' \ + --with-configdir=/usr/share/xscreensaver/config \ + --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 + install -d ${pkgdir}/usr/lib/xscreensaver/ + list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) + for i in $list; do + ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" + done + + install -d ${pkgdir}/usr/share/applications/screensavers + install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers +} diff --git a/community-testing/rss-glx/rss-glx-desktops.tar.bz2 b/community-testing/rss-glx/rss-glx-desktops.tar.bz2 Binary files differnew file mode 100644 index 000000000..940fd5277 --- /dev/null +++ b/community-testing/rss-glx/rss-glx-desktops.tar.bz2 diff --git a/community-testing/rss-glx/rss-glx.install b/community-testing/rss-glx/rss-glx.install new file mode 100644 index 000000000..758642618 --- /dev/null +++ b/community-testing/rss-glx/rss-glx.install @@ -0,0 +1,12 @@ +post_install() { + cat << 'EOM' + --> If you want to integrate the RSS screen savers with xscreensaver + --> for your user, then install the xscreensaver package and launch + --> the command "rss-glx_install.pl" +EOM + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/community-testing/sfml/PKGBUILD b/community-testing/sfml/PKGBUILD new file mode 100644 index 000000000..8650d6c50 --- /dev/null +++ b/community-testing/sfml/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 74521 2012-07-29 21:16:25Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ondrej Martinak <omartinak@gmail.com> + +pkgname=sfml +pkgver=2.0rc1 +pkgrel=2 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('mesa' 'cmake' 'doxygen') +install=sfml.install +source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc") +md5sums=('03c8e6817f4525092b94a3d44e8eada8') + +build() { + cd "$srcdir"/Laurent* + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true \ + -DBUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir"/Laurent*/build + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake" + + install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-testing/sfml/sfml.install b/community-testing/sfml/sfml.install new file mode 100644 index 000000000..75f760be6 --- /dev/null +++ b/community-testing/sfml/sfml.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually" +} diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD index 4cccb63b3..f7dae92f1 100644 --- a/community-testing/spring/PKGBUILD +++ b/community-testing/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73775 2012-07-15 13:20:50Z ibiru $ +# $Id: PKGBUILD 74522 2012-07-29 21:16:32Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,16 +6,17 @@ pkgname=spring pkgver=0.89.0 _pkgver=89.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" license=('GPL') depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' - 'libxcursor') + 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils') makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') +install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma boost-1.50.patch) md5sums=('36fc266e925bc3790a68bf1bc7ebb315' @@ -27,21 +28,21 @@ build() { cd spring_${_pkgver} sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h - patch -Np1 < $srcdir/boost-1.50.patch + patch -Np1 < "$srcdir/boost-1.50.patch" cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring + -DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES make } package() { cd spring_${_pkgver} - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install - install -d $pkgdir/etc/spring - echo '$HOME/.spring' > $pkgdir/etc/spring/datadir + install -d "$pkgdir/etc/spring" + echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir" } # vim sw=2:ts=2 et: diff --git a/community-testing/spring/spring.install b/community-testing/spring/spring.install new file mode 100644 index 000000000..41f09f887 --- /dev/null +++ b/community-testing/spring/spring.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/supertux/PKGBUILD b/community-testing/supertux/PKGBUILD new file mode 100644 index 000000000..3a0774e73 --- /dev/null +++ b/community-testing/supertux/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 74523 2012-07-29 21:16:37Z ebelanger $ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> +# Contributor: vande198 +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=supertux +pkgver=0.3.3 +pkgrel=6 +pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" +arch=('i686' 'x86_64') +url="http://super-tux.sourceforge.net/" +license=('GPL') +depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') +makedepends=('cmake' 'boost') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 + supertux2-0.3.3-squirrel-gcc47.patch) +md5sums=('f3f803e629ee51a9de0b366a036e393d' + 'eb06315514be4f200428f14b927beb66') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" + sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + sed -i '/types\.h/d' src/addon/addon_manager.cpp + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch new file mode 100644 index 000000000..16781b610 --- /dev/null +++ b/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch @@ -0,0 +1,36 @@ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h 1970-01-01 01:00:00.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h 2012-05-01 11:59:37.000000000 +0200 +@@ -0,0 +1,8 @@ ++/* see copyright notice in squirrel.h */ ++#ifndef _SQMEM_H_ ++#define _SQMEM_H_ ++ ++void *sq_vm_malloc(SQUnsignedInteger size); ++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); ++void sq_vm_free(void *p,SQUnsignedInteger size); ++#endif //_SQMEM_H_ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h 2010-03-01 13:40:58.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h 2012-05-01 11:59:37.000000000 +0200 +@@ -136,8 +136,4 @@ + extern SQObjectPtr _minusone_; + + bool CompileTypemask(SQIntVec &res,const SQChar *typemask); +- +-void *sq_vm_malloc(SQUnsignedInteger size); +-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); +-void sq_vm_free(void *p,SQUnsignedInteger size); + #endif //_SQSTATE_H_ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h 2010-03-01 13:40:58.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h 2012-05-01 11:59:37.000000000 +0200 +@@ -2,6 +2,8 @@ + #ifndef _SQUTILS_H_ + #define _SQUTILS_H_ + ++#include "sqmem.h" ++ + #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;} + #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));} + #define SQ_MALLOC(__size) sq_vm_malloc((__size)); diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD new file mode 100644 index 000000000..7c483876c --- /dev/null +++ b/community-testing/vdrift/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 74524 2012-07-29 21:16:42Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf lonewolf@xs4all.nl + +pkgname=vdrift +pkgver=2011.10.22 +pkgrel=7 +pkgdesc="Open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') +url="http://vdrift.net/" +license=('GPL') +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' + 'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive') +makedepends=('scons' 'boost' 'asio') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2) +md5sums=('6f8806ab1be303e9e1e47522c9eee890') +install=vdrift.install + +build() { + cd "$srcdir" + + cd $pkgname-${pkgver//./-} + + # select arch + if [ `uname -m` = "x86_64" ]; then + _sconsarch="a64" + else + _sconsarch="686" + fi + + #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + #sed -i '/types.h/d' src/http.h + + # build and install + scons $MAKEFLAGS \ + "destdir"="$pkgdir" \ + "arch"=$_sconsarch \ + "release"=1 \ + "force_feedback"=1 \ + "prefix"=/usr \ + "datadir"=share/$pkgname/ \ + "extbullet"=1 +} + +package() { + cd "$srcdir"/$pkgname-${pkgver//./-} + + scons install + + # install .desktop file + install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?) + + # install icons + install -Dm644 data/textures/icons/vdrift-16x16.png \ + "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-32x32.png \ + "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + + rm -r "$pkgdir"/usr/share/vdrift +} +# vim: sw=2:ts=2 et: diff --git a/community-testing/vdrift/vdrift.install b/community-testing/vdrift/vdrift.install new file mode 100644 index 000000000..868f6717b --- /dev/null +++ b/community-testing/vdrift/vdrift.install @@ -0,0 +1,11 @@ +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-testing/widelands/6233_6232.diff b/community-testing/widelands/6233_6232.diff new file mode 100644 index 000000000..f82477607 --- /dev/null +++ b/community-testing/widelands/6233_6232.diff @@ -0,0 +1,59 @@ +=== modified file 'src/graphic/graphic.cc' +--- src/graphic/graphic.cc 2011-11-30 21:38:37 +0000 ++++ src/graphic/graphic.cc 2012-02-19 17:10:12 +0000 +@@ -725,6 +725,18 @@ + if (!png_ptr) + throw wexception("Graphic::save_png: could not create png struct"); + ++ png_infop info_ptr = png_create_info_struct(png_ptr); ++ if (!info_ptr) { ++ png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); ++ throw wexception("Graphic::save_png: could not create png info struct"); ++ } ++ ++ // Set jump for error ++ if (setjmp(png_jmpbuf(png_ptr))) { ++ png_destroy_write_struct(&png_ptr, &info_ptr); ++ throw wexception("Graphic::save_png: Error writing PNG!"); ++ } ++ + // Set another write function. This is potentially dangerouse because the + // flush function is internally called by png_write_end(), this will crash + // on newer libpngs. See here: +@@ -736,35 +748,14 @@ + sw, + &Graphic::m_png_write_function, &Graphic::m_png_flush_function); + +- png_infop info_ptr = png_create_info_struct(png_ptr); +- +- if (!info_ptr) { +- png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); +- throw wexception("Graphic::save_png: could not create png info struct"); +- } +- +- // Set jump for error +- if (setjmp(png_jmpbuf(png_ptr))) { +- png_destroy_write_struct(&png_ptr, &info_ptr); +- throw wexception("Graphic::save_png: could not set png setjmp"); +- } +- + // Fill info struct + png_set_IHDR + (png_ptr, info_ptr, pix.get_w(), pix.get_h(), + 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + +- // png_set_strip_16(png_ptr) ; +- + // Start writing + png_write_info(png_ptr, info_ptr); +- +- // Strip data down +- png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); +- +- png_set_packing(png_ptr); +- + { + uint32_t surf_w = pix.get_w(); + uint32_t surf_h = pix.get_h(); + diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD new file mode 100644 index 000000000..b98a6dbc6 --- /dev/null +++ b/community-testing/widelands/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 74525 2012-07-29 21:16:58Z ebelanger $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> + +pkgname=widelands +pkgver=17 +_realver=build17 +pkgrel=3 +pkgdesc="A realtime strategy game with emphasis on economy and transport" +arch=('i686' 'x86_64') +url="http://widelands.org/" +license=('GPL') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data') +makedepends=('cmake' 'boost') +source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" + $pkgname.desktop + $pkgname.png + $pkgname.sh) +md5sums=('bdc9bc0aa631af1aa7fb450507611a58' + '15820bf099fd6f16251fe70a75c534bb' + '3dfda7e9ca76ca00dd98d745d0ceb328' + '7cae50aba5ed0cd2cfeea79124637b46') + +build() { + cd $srcdir/$pkgname-$_realver-src + + sed -i "1 i #include <unistd.h>" src/main.cc + + mkdir -p build/compile && cd build/compile + + cmake ../.. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_DATADIR=share/$pkgname \ + -DWL_INSTALL_BINDIR=bin + make +} + +package() { + cd $srcdir/$pkgname-$_realver-src/build/compile + + make DESTDIR="$pkgdir" install + + rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds} + + # Install bin, icon and desktop file + #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname + #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/community-testing/widelands/widelands-0.16-libpng15.patch b/community-testing/widelands/widelands-0.16-libpng15.patch new file mode 100644 index 000000000..9f733e7b9 --- /dev/null +++ b/community-testing/widelands/widelands-0.16-libpng15.patch @@ -0,0 +1,61 @@ +--- src/graphic/SDL_mng.cc ++++ src/graphic/SDL_mng.cc +@@ -276,7 +276,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + SDL_SetError("Error reading the PNG file."); + goto done; + } +@@ -356,9 +356,9 @@ + Rmask = 0x000000FF; + Gmask = 0x0000FF00; + Bmask = 0x00FF0000; +- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; ++ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; + } else { +- int const s = (info_ptr->channels == 4) ? 0 : 8; ++ int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; + Rmask = 0xFF000000 >> s; + Gmask = 0x00FF0000 >> s; + Bmask = 0x0000FF00 >> s; +@@ -369,7 +369,7 @@ + SDL_AllocSurface + (SDL_SWSURFACE, + width, height, +- bit_depth * info_ptr->channels, ++ bit_depth * png_get_channels(png_ptr, info_ptr), + Rmask, Gmask, Bmask, Amask); + if (not surface) { + SDL_SetError("Out of memory"); +@@ -407,6 +407,9 @@ + /* read rest of file, get additional chunks in info_ptr - REQUIRED */ + png_read_end(png_ptr, info_ptr); + ++ png_colorp png_palette; ++ int png_num_palette; ++ + /* Load the palette, if any */ + if ((palette = surface->format->palette)) { + if (color_type == PNG_COLOR_TYPE_GRAY) { +@@ -416,12 +419,12 @@ + palette->colors[i].g = i; + palette->colors[i].b = i; + } +- } else if (info_ptr->num_palette > 0) { +- palette->ncolors = info_ptr->num_palette; +- for (uint32_t i = 0; i < info_ptr->num_palette; ++i) { +- palette->colors[i].b = info_ptr->palette[i].blue; +- palette->colors[i].g = info_ptr->palette[i].green; +- palette->colors[i].r = info_ptr->palette[i].red; ++ } else if (png_num_palette > 0) { ++ palette->ncolors = png_num_palette; ++ for (uint32_t i = 0; i < png_num_palette; ++i) { ++ palette->colors[i].b = png_palette[i].blue; ++ palette->colors[i].g = png_palette[i].green; ++ palette->colors[i].r = png_palette[i].red; + } + } + } diff --git a/community-testing/widelands/widelands-build15-gcc-4.5-patch b/community-testing/widelands/widelands-build15-gcc-4.5-patch new file mode 100644 index 000000000..6ba313358 --- /dev/null +++ b/community-testing/widelands/widelands-build15-gcc-4.5-patch @@ -0,0 +1,51 @@ +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 +@@ -272,7 +272,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -343,7 +343,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + diff --git a/community-testing/widelands/widelands.desktop b/community-testing/widelands/widelands.desktop new file mode 100644 index 000000000..9715d816c --- /dev/null +++ b/community-testing/widelands/widelands.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Widelands +GenericName=Widelands +Comment=Realtime strategy game +Icon=widelands +Exec=widelands +Type=Application +Categories=Game;StrategyGame; diff --git a/community-testing/widelands/widelands.png b/community-testing/widelands/widelands.png Binary files differnew file mode 100644 index 000000000..c329cf667 --- /dev/null +++ b/community-testing/widelands/widelands.png diff --git a/community-testing/widelands/widelands.sh b/community-testing/widelands/widelands.sh new file mode 100644 index 000000000..0b21a1694 --- /dev/null +++ b/community-testing/widelands/widelands.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/share/widelands +./widelands $* diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 9a3937901..cbe9e65f0 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72043 2012-06-06 19:44:09Z lcarlier $ +# $Id: PKGBUILD 74503 2012-07-29 19:34:09Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.10 +pkgver=1.99.12 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." @@ -15,14 +15,14 @@ makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('8d8a45f10fe68c08d2248ea1df62a697' +md5sums=('6cce2f994867fbe8a637a129c721546b' '242a9390bc943cc38237fa71137fb26c') build() { cd ${srcdir}/jungleji-chmsee-*/src cp Makefile.arch Makefile - sed -i -e 's/12.*/13.*/g' ../application.ini + #sed -i -e 's/12.*/13.*/g' ../application.ini make } diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index ebe2a2b12..081942518 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72971 2012-06-25 18:51:13Z foutrelis $ +# $Id: PKGBUILD 74496 2012-07-29 17:53:21Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -12,7 +12,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=2 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -40,7 +40,8 @@ source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 md5sums=('b59072b6f57b681d586cc84c02333690' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b') + 'ab5667175c4945282d2f40a35d0e9e5b' + '5eb70afe712c0f8667a700df4d9a6735') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" _buildgbcomp() { @@ -88,7 +89,7 @@ package_gambas2-meta() { 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -101,6 +102,8 @@ package_gambas2-meta() { package_gambas2-runtime() { depends=('libffi' 'xdg-utils') pkgdesc="Gambas2 runtime environment" + provides=('gambas2-gb-gui') + conflicts=('gambas2-gb-gui') install=gambas2-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -116,8 +119,16 @@ package_gambas2-runtime() { ${pkgdir}/usr/lib/gambas2 ln -s gbx2 ${pkgdir}/usr/bin/gbr2 ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la} + rm ${pkgdir}/usr/share/gambas2/info/gb.qt* + ## needed for postinst with xdg-utils install -d -m755 ${pkgdir}/usr/share/gambas2/mime install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ @@ -192,7 +203,7 @@ package_gambas2-examples() { 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -200,7 +211,6 @@ package_gambas2-examples() { 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgdesc="Gambas2 examples" -# arch=('any') cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install @@ -212,7 +222,6 @@ package_gambas2-examples() { package_gambas2-help() { depends=() pkgdesc="Gambas2 help files" -# arch=('any') cd ${srcdir}/${pkgbase}-${pkgver}/help make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install @@ -225,7 +234,6 @@ package_gambas2-script() { depends=('gambas2-devel') pkgdesc="Gambas2 scripter and server programs support" install=gambas2-script.install -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -259,7 +267,6 @@ package_gambas2-script() { package_gambas2-gb-chart() { depends=('gambas2-gb-form') pkgdesc="Gambas2 chart component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -332,7 +339,6 @@ package_gambas2-gb-db-firebird() { package_gambas2-gb-db-form() { depends=('gambas2-gb-db' 'gambas2-gb-form') pkgdesc="Gambas2 database form component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -426,9 +432,8 @@ package_gambas2-gb-desktop() { } package_gambas2-gb-form() { - depends=('gambas2-gb-gui') + depends=('gambas2-gb-runtime') pkgdesc="Gambas2 form component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -456,7 +461,6 @@ package_gambas2-gb-form() { package_gambas2-gb-form-dialog() { depends=('gambas2-gb-form') pkgdesc="Gambas2 form dialog component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -485,7 +489,6 @@ package_gambas2-gb-form-dialog() { package_gambas2-gb-form-mdi() { depends=('gambas2-gb-form') pkgdesc="Gambas2 form MDI component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -576,31 +579,6 @@ package_gambas2-gb-gtk-svg() { ## } -package_gambas2-gb-gui() { - depends=('gambas2-gb-qt' 'gambas2-gb-gtk') - pkgdesc="Gambas2 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - package_gambas2-gb-image() { depends=('gambas2-runtime') pkgdesc="Gambas2 image processing component" @@ -612,7 +590,6 @@ package_gambas2-gb-image() { package_gambas2-gb-info() { depends=('gambas2-runtime') pkgdesc="Gambas2 info component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -773,7 +750,6 @@ package_gambas2-gb-qt-kde-html() { package_gambas2-gb-report() { depends=('gambas2-runtime' 'gambas2-gb-form') pkgdesc="Gambas2 report component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -820,7 +796,6 @@ package_gambas2-gb-sdl-sound() { package_gambas2-gb-settings() { depends=('gambas2-runtime') pkgdesc="Gambas2 settings management component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -857,7 +832,6 @@ package_gambas2-gb-vb() { package_gambas2-gb-web() { depends=('gambas2-runtime') pkgdesc="Gambas2 CGI component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -947,8 +921,3 @@ package_gambas2-gb-xml-xslt() { rm -rf ${pkgdir}/usr/bin ## } -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b' - '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD index 069f5666a..9a08f17a3 100644 --- a/community/warsow/PKGBUILD +++ b/community/warsow/PKGBUILD @@ -1,87 +1,57 @@ -# $Id: PKGBUILD 64728 2012-02-18 03:09:46Z svenstaro $ +# $Id: PKGBUILD 74467 2012-07-29 03:46:52Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Slash <demodevil5[at]yahoo[dot]com> # Contributor: Babets # Contributor: Vain pkgname=warsow -pkgver=0.62 -pkgrel=3 -pkgdesc="a free online multiplayer competitive FPS based on the Qfusion engine" +pkgver=1.0 +pkgrel=1 +pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine" url="http://www.warsow.net/" license=('GPL') arch=('i686' 'x86_64') -depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data') -makedepends=('mesa' 'openal' 'unzip') +depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data' 'libxrandr' 'libpng' 'libtheora') +makedepends=('mesa' 'openal' 'imagemagick' 'gendesk') optdepends=('openal: for openal audio support') -source=('warsow.desktop' 'warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \ -"http://www.zcdn.org/dl/warsow_${pkgver}_sdk.zip") -noextract=("warsow_${pkgver}_sdk.zip") -md5sums=('f9bf60c80820237f7097c4e50a9582cd' - 'ec00081d81ad9802a8ca42fc2eac5498' +source=('warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \ + "http://funpark.warsow-esport.net/~warsow/1.0/warsow_${pkgver}_sdk.tar.gz") +_genericname=('First person shooter') +_comment=('Online Mulitiplayer Competitive FPS') +md5sums=('ec00081d81ad9802a8ca42fc2eac5498' 'f73e10c26197178df71b941b10bf83d7' 'd7e4a69835bbcf801e58307e9d6b951e' - '649568447e938efded07e77cdfb3accb') + '35b9a8f530b51cda15c660b3a73f377e') build() { - unset CFLAGS - unset CXXFLAGS + cd "$srcdir" + gendesk -n - # Extract Game Source Code - unzip -o warsow_${pkgver}_sdk.zip -d $srcdir/warsow-src - - # Patch Makefile to use correct program to query for system information - sed -i 's:openal-config:pkg-config:g' $srcdir/warsow-src/source/Makefile - - # Patch Makefile to correctly pass on ld opts - sed -i 's:--as-needed:-Wc,--as-needed:g' $srcdir/warsow-src/source/Makefile - - # Patch Sound Code to point to base openal library - sed -i 's:libopenal.so.0:libopenal.so:g' $srcdir/warsow-src/source/snd_openal/snd_main.c - - # Patch for libjpeg8 - sed -i 's/jpeg_mem_src/_jpeg_mem_src/g' $srcdir/warsow-src/source/ref_gl/r_image.c - - # Patch AngelScript so it compiles correctly on i686 - if [ "$CARCH" == "i686" ]; then - sed -i 's:CXXFLAGS = \(.*\):CXXFLAGS = -march=i686 \1:' \ - $srcdir/warsow-src/libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile - fi + # This was used to fix some crashing due to alignment problems before. Has upstream + # finally got their shit together and we don't need them anymore? + #unset CFLAGS + #unset CXXFLAGS # Compile Warsow - cd $srcdir/warsow-src/source/ + cd $srcdir/warsow_${pkgver}_sdk/source/ make -j1 } package() { - cd $srcdir/warsow-src/source/ + cd $srcdir/warsow_${pkgver}_sdk/source/ # Create Destination Directories install -d $pkgdir/opt/warsow/ # Move Compiled Data to Destination Directory - cp -r $srcdir/warsow-src/source/release/* \ - $pkgdir/opt/warsow - - # Install Client Game Launcher - install -D -m 0755 $srcdir/warsow.launcher \ - $pkgdir/usr/bin/warsow - - # Install Server Game Launcher - install -D -m 0755 $srcdir/wsw-server.launcher \ - $pkgdir/usr/bin/wsw-server - - # Install WSWTV Server Launcher - install -D -m 0755 $srcdir/wswtv-server.launcher \ - $pkgdir/usr/bin/wswtv-server - - # Install Client Desktop Shortcut - install -D -m 0644 $srcdir/warsow.desktop \ - $pkgdir/usr/share/applications/warsow.desktop - - # Install Icon - install -D -m 0644 $srcdir/warsow-src/source/win32/warsow.ico \ - $pkgdir/usr/share/pixmaps/warsow.ico + cp -r $srcdir/warsow_${pkgver}_sdk/source/release/* $pkgdir/opt/warsow + + install -D -m 0755 $srcdir/warsow.launcher $pkgdir/usr/bin/warsow + install -D -m 0755 $srcdir/wsw-server.launcher $pkgdir/usr/bin/wsw-server + install -D -m 0755 $srcdir/wswtv-server.launcher $pkgdir/usr/bin/wswtv-server + install -D -m 0644 $srcdir/warsow.desktop $pkgdir/usr/share/applications/warsow.desktop + convert $srcdir/warsow_${pkgver}_sdk/source/win32/warsow.ico $srcdir/warsow.png + install -D -m 0644 $srcdir/warsow-0.png $pkgdir/usr/share/pixmaps/warsow.png } # vim: ts=2:sw=2 diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index f1df3ac0a..8c4860871 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74389 2012-07-26 08:51:55Z spupykin $ +# $Id: PKGBUILD 74507 2012-07-29 20:16:09Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2 -_pkgver=3.2.2 -pkgrel=1 +pkgver=3.2.2.1 +_pkgver=3.2.2-p1 +pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" license=('GPL') -depends=('boost-libs>=1.36') -makedepends=('boost>=1.36' 'cmake>=2.8' +depends=('boost-libs') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' @@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') +md5sums=('d436430a4f1ae5fbcf038e645e4b5260') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 6da9facd8..7f4bc70e3 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162251 2012-06-24 12:43:16Z guillaume $ +# $Id: PKGBUILD 164263 2012-07-29 10:20:53Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -12,7 +12,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('3eca81253800a0089d0f957e75853b05') +md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -61,7 +61,13 @@ package_wireshark-gtk() { install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + install -Dm644 image/hi${d}-app-wireshark.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + done + + for d in 16 24 32 48 64 128 256 ; do + install -Dm644 image/WiresharkDoc-${d}.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" done install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" } diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 6585ba272..69adcc4bc 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,18 +1,18 @@ post_install() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" } post_upgrade() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { - if getent group wireshark >/dev/null 2>&1; then - groupdel wireshark + if /usr/bin/getent group wireshark >/dev/null 2>&1; then + /usr/sbin/groupdel wireshark fi } diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b552dcca5..0ef52901a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -16,7 +16,7 @@ _basekernel=3.5 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'i915-fix-ghost-tv-output.patch' + 'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - 'a89ff57fd3ce5833d51f7cdef17a9a3c' - '978a58bebbdfe04d6e91523e09da5ad5' + '7f0b7950bc9d2a20cdb6b850e6e4eb5a' + 'a796ea383eb136cb38fab0a52b6d2f52' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' + '2afcc001cc178be72e3a19d95f4bd5eb' 'a9338d11a2b23fe0cd43cc4fee5aed42') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -60,21 +60,16 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # Some chips detect a ghost TV output - # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html - # Arch Linux bug report: FS#19234 - # - # It is unclear why this patch wasn't merged upstream, it was accepted, - # then dropped because the reasoning was unclear. However, it is clearly - # needed. - patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix avmfritz capi20 functionallity + # https://bugzilla.kernel.org/show_bug.cgi?id=45271 + patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch new file mode 100644 index 000000000..f8bb193c6 --- /dev/null +++ b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch @@ -0,0 +1,48 @@ +From 285c08154eede7dc4387bfc925967c884594dcc9 Mon Sep 17 00:00:00 2001 +From: Karsten Keil <keil@b1-systems.de> +Date: Sat, 28 Jul 2012 20:10:04 +0200 +Subject: [PATCH] mISDN: Bugfix only few bytes are transfered on a connection + +The test for the fillempty condition was wrong in one place. +Changed the variable to the right boolean type. + +Signed-off-by: Karsten Keil <keil@b1-systems.de> +--- + drivers/isdn/hardware/mISDN/avmfritz.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c +index c08fc60..fa6ca47 100644 +--- a/drivers/isdn/hardware/mISDN/avmfritz.c ++++ b/drivers/isdn/hardware/mISDN/avmfritz.c +@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch) + { + struct fritzcard *fc = bch->hw; + struct hdlc_hw *hdlc; +- int count, fs, cnt = 0, idx, fillempty = 0; ++ int count, fs, cnt = 0, idx; ++ bool fillempty = false; + u8 *p; + u32 *ptr, val, addr; + +@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch) + return; + count = fs; + p = bch->fill; +- fillempty = 1; ++ fillempty = true; + } else { + count = bch->tx_skb->len - bch->tx_idx; + if (count <= 0) +@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch) + hdlc->ctrl.sr.cmd |= HDLC_CMD_XME; + } + ptr = (u32 *)p; +- if (fillempty) { ++ if (!fillempty) { + pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count, + bch->tx_idx, bch->tx_skb->len); + bch->tx_idx += count; +-- +1.7.7 + diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 114841394..a66ebeaa7 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.5.0-1 Kernel Configuration +# Linux/i386 3.5.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -204,9 +204,11 @@ CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -1071,7 +1073,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1191,6 +1195,7 @@ CONFIG_BQL=y # Network testing # CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y @@ -5624,6 +5629,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5664,8 +5670,9 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y -# CONFIG_UPROBE_EVENT is not set -# CONFIG_PROBE_EVENTS is not set +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5697,6 +5704,7 @@ CONFIG_DEBUG_RODATA=y CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index fcc8b37dd..350a2b905 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.5.0-1 Kernel Configuration +# Linux/x86_64 3.5.0-2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -206,9 +206,11 @@ CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -1036,7 +1038,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1153,6 +1157,7 @@ CONFIG_BPF_JIT=y # Network testing # CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y @@ -5393,6 +5398,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5433,8 +5439,9 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y -# CONFIG_UPROBE_EVENT is not set -# CONFIG_PROBE_EVENTS is not set +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5466,6 +5473,7 @@ CONFIG_DEBUG_RODATA=y # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 87de3c8d5..5f1005477 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.5.0-1-LIBRE +KERNEL_VERSION=3.5.0-2-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 4442712f0..4b3384c25 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=24 +pkgrel=25 epoch=1 _extramodules=extramodules-3.5-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index ef63d7ff0..d1b6f5fae 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') pkgver=4.1.18 -pkgrel=5.1 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -47,12 +47,16 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' 'f7d275fc52e5f3cfafd85646c2914063') _extramodules=extramodules-3.5-LIBRE -_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" -export KERN_DIR=/usr/lib/modules/${_kernver}/build -export KERN_INCL=/usr/src/linux-${_kernver}/include/ + + build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" + + export KERN_DIR=/usr/lib/modules/${_kernver}/build + export KERN_INCL=/usr/src/linux-${_kernver}/include/ + cd "$srcdir/VirtualBox-${pkgver}" patch -Np1 -i "$srcdir/libre.patch" diff --git a/multilib/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD index c05932afe..3c2c123a8 100644 --- a/multilib/lib32-llvm/PKGBUILD +++ b/multilib/lib32-llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71120 2012-05-24 14:15:03Z lcarlier $ +# $Id: PKGBUILD 74497 2012-07-29 17:55:12Z lcarlier $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -11,7 +11,7 @@ pkgname=('lib32-llvm') pkgver=3.1 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') @@ -94,8 +94,6 @@ package() { # Fix permissions of static libs chmod -x "$pkgdir"/usr/lib32/llvm/*.a - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - # sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config" mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" # Get rid of example Hello transformation diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index af9075f4d..ad78cf9f2 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73672 2012-07-13 07:27:12Z lcarlier $ +# $Id: PKGBUILD 74498 2012-07-29 17:55:29Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -16,10 +16,10 @@ if [ "${_git}" = "true" ]; then pkgver=8.0.4 fi -pkgrel=1 +pkgrel=3 arch=('x86_64') makedepends=('glproto>=1.4.15' 'lib32-libdrm>=2.4.33' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1' - 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap') + 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap') url="http://mesa3d.sourceforge.net" license=('custom') source=('mesa-8.0.3-llvm-3.1-fixes.patch') diff --git a/staging/exiv2/PKGBUILD b/staging/exiv2/PKGBUILD new file mode 100644 index 000000000..499ace7a9 --- /dev/null +++ b/staging/exiv2/PKGBUILD @@ -0,0 +1,25 @@ +#$Id: PKGBUILD 164301 2012-07-30 00:12:14Z eric $ +# Maintainer: tobias <tobias@arhlinux.org> + +pkgname=exiv2 +pkgver=0.23 +pkgrel=1 +pkgdesc="Exif and Iptc metadata manipulation library and tools" +arch=('i686' 'x86_64') +url="http://exiv2.org" +license=('GPL') +depends=('gcc-libs' 'zlib' 'expat') +options=('!libtool') +source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz") +sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/geeqie/PKGBUILD b/staging/geeqie/PKGBUILD new file mode 100644 index 000000000..53fdb8a31 --- /dev/null +++ b/staging/geeqie/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 164303 2012-07-30 00:23:10Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=geeqie +pkgver=1.0 +pkgrel=7 +pkgdesc="A lightweight image browser and viewer (fork of GQview)" +arch=('i686' 'x86_64') +url="http://geeqie.sourceforge.net/" +license=('GPL3') +depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils') +makedepends=('intltool' 'doxygen' 'gnome-doc-utils') +optdepends=('librsvg: SVG rendering') +replaces=('gqview-devel') +install=geeqie.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/geeqie/geeqie.install b/staging/geeqie/geeqie.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/staging/geeqie/geeqie.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD new file mode 100644 index 000000000..037d2b52c --- /dev/null +++ b/staging/gimp-ufraw/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 164305 2012-07-30 00:32:08Z eric $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> + +pkgname=gimp-ufraw +pkgver=0.18 +pkgrel=5 +pkgdesc="Standalone or gimp plugin converter for raw files" +url="http://ufraw.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils') +makedepends=('gimp' 'cinepaint') +optdepends=('gimp: to use the gimp import plugin for raw images' + 'cinepaint: to use the cinepaint import plugin for raw images') +install=gimp-ufraw.install +source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz) +sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2') + +build() { + cd "${srcdir}/ufraw-${pkgver}" + + ./configure --prefix=/usr \ + --enable-extras \ + --enable-mime \ + --enable-openmp + sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile + make +} + +package() { + cd "${srcdir}/ufraw-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/bin/dcraw" +} diff --git a/staging/gimp-ufraw/gimp-ufraw.install b/staging/gimp-ufraw/gimp-ufraw.install new file mode 100644 index 000000000..80312d4a6 --- /dev/null +++ b/staging/gimp-ufraw/gimp-ufraw.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD new file mode 100644 index 000000000..1dce3cd09 --- /dev/null +++ b/staging/gthumb/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 164309 2012-07-30 03:08:17Z eric $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gthumb +pkgver=3.0.1 +pkgrel=2 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/gthumb" +depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' + 'gstreamer0.10-base' 'gsettings-desktop-schemas') +makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' + 'brasero' 'librsvg' 'libopenraw' 'liboauth') +optdepends=('libopenraw: read RAW files' + 'exiv2: metadata support' + 'libchamplain: map viewer' + 'brasero: burn discs' + 'libsoup-gnome: web albums' + 'liboauth: web albums') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1fb2939e4896a012c7d0320a31e3c6139214218e9f6ec39c6370febeda94725c') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-libchamplain --enable-libopenraw + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install new file mode 100644 index 000000000..9d4e7822f --- /dev/null +++ b/staging/gthumb/gthumb.install @@ -0,0 +1,19 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.1) < 0 )); then + gconfpkg --uninstall gthumb + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD index 0436f695d..fe88d48b1 100644 --- a/staging/hugin/PKGBUILD +++ b/staging/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164243 2012-07-28 06:15:16Z eric $ +# $Id: PKGBUILD 164307 2012-07-30 00:51:11Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD new file mode 100644 index 000000000..e1eb83023 --- /dev/null +++ b/testing/bzflag/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 164278 2012-07-29 21:07:44Z eric $ +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Kevin Piche <kevin@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=bzflag +pkgver=2.4.0 +pkgrel=4 +pkgdesc='Multiplayer 3D tank battle game' +url='http://bzflag.org/' +license=('LGPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('curl' 'glew' 'mesa' 'sdl') +source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") +sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make + + cd misc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop + install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png +} diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD index 4d285c763..29fd88892 100644 --- a/testing/calligra/PKGBUILD +++ b/testing/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162291 2012-06-24 19:24:34Z foutrelis $ +# $Id: PKGBUILD 164279 2012-07-29 21:08:11Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -22,7 +22,7 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' @@ -31,10 +31,10 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' 'kdegraphics-okular' 'gsl' 'kdeedu-marble' 'libwpd' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') + 'fftw' 'opengtl' 'lcms2' 'libkdcraw') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('31b0c44ad4ee27017580c7c2fc8e87a9') +md5sums=('469d639f17e3d6a186baabd899147e39') build() { cd "${srcdir}" @@ -254,7 +254,7 @@ package_calligra-braindump() { package_calligra-flow() { pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-libs' 'kdebase-runtime') + depends=('calligra-words' 'kdebase-runtime') conflicts=('calligra-flow-doc') replaces=('calligra-flow-doc') install=calligra-flow.install diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD new file mode 100644 index 000000000..51fd36e14 --- /dev/null +++ b/testing/enblend-enfuse/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 164280 2012-07-29 21:08:21Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=enblend-enfuse +pkgver=4.0 +pkgrel=6 +pkgdesc="Intelligent blend tool for overlapping picture" +arch=("i686" "x86_64") +license=('GPL') +url="http://enblend.sourceforge.net" +depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs') +makedepends=('boost') +replaces=('enblend') +conflicts=('enblend') +provides=('enblend') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \ + libpng-1.4.patch enblend-4.0-libpng15.patch) +sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' + 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' + 'eae6cf48ea082865130302d0b4d1ca0b884a563b' + '71e961d90be842eafe9d473d8d70b04b29077036') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx + patch -p1 -i ../libpng-1.4.patch + patch -p0 -i ../enblend-4.0-libpng15.patch + LIBS="-lboost_system" ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + make DESTDIR="${pkgdir}" install + install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" + install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" +} diff --git a/testing/enblend-enfuse/enblend-4.0-libpng15.patch b/testing/enblend-enfuse/enblend-4.0-libpng15.patch new file mode 100644 index 000000000..d4465ccad --- /dev/null +++ b/testing/enblend-enfuse/enblend-4.0-libpng15.patch @@ -0,0 +1,220 @@ +--- src/vigra_impex/png.cxx ++++ src/vigra_impex/png.cxx +@@ -81,7 +81,7 @@ + static void PngError( png_structp png_ptr, png_const_charp error_msg ) + { + png_error_message = std::string(error_msg); +- longjmp( png_ptr->jmpbuf, 1 ); ++ longjmp( png_jmpbuf( png_ptr ), 1 ); + } + + // called on non-fatal errors +@@ -213,7 +213,7 @@ + vigra_postcondition( png != 0, "could not create the read struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); + } +@@ -221,14 +221,14 @@ + vigra_postcondition( info != 0, "could not create the info struct." ); + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } + png_init_io( png, file.get() ); + + // specify that the signature was already read +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_read_struct( &png, &info, NULL ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); + } +@@ -244,13 +244,13 @@ + void PngDecoderImpl::init() + { + // read all chunks up to the image data +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); + png_read_info( png, info ); + + // pull over the header fields + int interlace_method, compression_method, filter_method; +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); + png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, + &interlace_method, &compression_method, &filter_method ); +@@ -264,7 +264,7 @@ + + // transform palette to rgb + if ( color_type == PNG_COLOR_TYPE_PALETTE) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); + png_set_palette_to_rgb(png); + color_type = PNG_COLOR_TYPE_RGB; +@@ -273,7 +273,7 @@ + + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); + png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; +@@ -283,7 +283,7 @@ + #if 0 + // strip alpha channel + if ( color_type & PNG_COLOR_MASK_ALPHA ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); + png_set_strip_alpha(png); + color_type ^= PNG_COLOR_MASK_ALPHA; +@@ -323,12 +323,12 @@ + + // read icc profile + #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) +- char * dummyName; ++ png_charpp dummyName; + int dummyCompType; +- char * profilePtr; ++ png_bytepp profilePtr; + png_uint_32 profileLen; +- if (info->valid & PNG_INFO_iCCP) { +- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; ++ if (png_get_valid(png, info, PNG_INFO_iCCP)) { ++ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; + iccProfilePtr = (unsigned char *) profilePtr; + iccProfileLength = profileLen; + } +@@ -340,7 +340,7 @@ + // image gamma + double image_gamma = 0.45455; + if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); + png_get_gAMA( png, info, &image_gamma ); + } +@@ -349,26 +349,26 @@ + double screen_gamma = 2.2; + + // set gamma correction +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); + png_set_gamma( png, screen_gamma, image_gamma ); + #endif + + // interlace handling, get number of read passes needed +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); + n_interlace_passes = png_set_interlace_handling(png); + + // update png library state to reflect any changes that were made +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); + png_read_update_info( png, info ); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); + n_channels = png_get_channels(png, info); + +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); + rowsize = png_get_rowbytes(png, info); + +@@ -379,7 +379,7 @@ + void PngDecoderImpl::nextScanline() + { + for (int i=0; i < n_interlace_passes; i++) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); + png_read_row(png, row_data.begin(), NULL); + } +@@ -545,7 +545,7 @@ + vigra_postcondition( png != 0, "could not create the write struct." ); + + // create info struct +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); + } +@@ -556,7 +556,7 @@ + } + + // init png i/o +- if (setjmp(png->jmpbuf)) { ++ if (setjmp(png_jmpbuf( png ))) { + png_destroy_write_struct( &png, &info ); + vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); + } +@@ -571,7 +571,7 @@ + void PngEncoderImpl::finalize() + { + // write the IHDR +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); + png_set_IHDR( png, info, width, height, bit_depth, color_type, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, +@@ -579,7 +579,7 @@ + + // set resolution + if (x_resolution > 0 && y_resolution > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); + png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), + (png_uint_32) (y_resolution / 0.0254 + 0.5), +@@ -588,7 +588,7 @@ + + // set offset + if (position.x > 0 && position.y > 0) { +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); + png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); + } +@@ -597,12 +597,12 @@ + // set icc profile + if (iccProfile.size() > 0) { + png_set_iCCP(png, info, "icc", 0, +- (char *)iccProfile.begin(), iccProfile.size()); ++ iccProfile.begin(), iccProfile.size()); + } + #endif + + // write the info struct +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); + png_write_info( png, info ); + +@@ -634,10 +634,10 @@ + } + + // write the whole image +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); + png_write_image( png, row_pointers.begin() ); +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf( png ))) + vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); + png_write_end(png, info); + } diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install new file mode 100644 index 000000000..24ea28a4e --- /dev/null +++ b/testing/enblend-enfuse/enblend-enfuse.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(enblend.info enfuse.info) + +post_install() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch new file mode 100644 index 000000000..3bf852b58 --- /dev/null +++ b/testing/enblend-enfuse/libpng-1.4.patch @@ -0,0 +1,14 @@ +diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx +--- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 ++++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 +@@ -275,8 +275,8 @@ + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); +- png_set_gray_1_2_4_to_8(png); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD new file mode 100644 index 000000000..fb56bab67 --- /dev/null +++ b/testing/glew/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 164281 2012-07-29 21:08:24Z eric $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: SleepyDog + +pkgname=glew +pkgver=1.8.0 +pkgrel=1 +pkgdesc="The OpenGL Extension Wrangler Library" +arch=('i686' 'x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('libxmu' 'libxi' 'mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|lib64|lib|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install.all + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a + chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +} diff --git a/testing/gtkpod/PKGBUILD b/testing/gtkpod/PKGBUILD new file mode 100644 index 000000000..2317110ed --- /dev/null +++ b/testing/gtkpod/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 164294 2012-07-29 23:15:49Z tomegun $ +# Contributor: Kevin Piche <kevin@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=gtkpod +pkgver=2.1.2 +pkgrel=2 +pkgdesc="A platform independent GUI for Apple's iPod using GTK3" +arch=('i686' 'x86_64') +url="http://gtkpod.sourceforge.net" +license=('GPL') +depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') +makedepends=('flex' 'intltool' 'libvorbis' 'faad2') +optdepends=('libmp4v2: MP4/h264 support' + 'vorbis-tools: OGG support' + 'libvorbis: OGG support' + 'id3v2: mp3 conversion support' + 'faad2: m4a conversion support') +install=gtkpod.install +options=('!libtool') +source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") +md5sums=('88fef3f947cbb7ae6b714080733a3b6b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#python#python2#' scripts/sync-palm-jppy.py + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gtkpod/gtkpod.install b/testing/gtkpod/gtkpod.install new file mode 100644 index 000000000..c5d357a38 --- /dev/null +++ b/testing/gtkpod/gtkpod.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD new file mode 100644 index 000000000..ab9d29025 --- /dev/null +++ b/testing/gvfs/PKGBUILD @@ -0,0 +1,112 @@ +# $Id: PKGBUILD 164298 2012-07-29 23:16:11Z tomegun $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.12.3 +pkgrel=3 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/usr/share/bash-completion/completions + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support' + 'gvfs-afp: Apple Filing Protocol (AFP) support') + install=gvfs.install + + cd "$pkgbase-$pkgver" + sed -e 's/^am__append_4/#am__append_4/' \ + -e 's/^am__append_5/#am__append_5/' \ + -i monitor/Makefile + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring') + install=gvfs-smb.install + + cd "$pkgbase-$pkgver/daemon" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=$pkgver" 'libimobiledevice') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/afc" + make DESTDIR="$pkgdir" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" + make DESTDIR="$pkgdir" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" +} + +package_gvfs-afp() { + pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" + depends=("gvfs=$pkgver") + install=gvfs-module.install + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + cd "$pkgbase-$pkgver/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" +} diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/testing/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install new file mode 100644 index 000000000..da6a2ab6d --- /dev/null +++ b/testing/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install new file mode 100644 index 000000000..3482d99e3 --- /dev/null +++ b/testing/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD index 4968503cc..355cc8c26 100644 --- a/testing/hugin/PKGBUILD +++ b/testing/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163546 2012-07-15 13:16:50Z ibiru $ +# $Id: PKGBUILD 164282 2012-07-29 21:08:31Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD index 3d3ad47bd..c21b8db89 100644 --- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0.3 +pkgver=0.9.0.4 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2") -sha256sums=('d8ad2dd89521dbe21e17131ef24bd7d792e90a150e15f0fbdab1bfa4a46e00f7') +sha256sums=('520d0592171ce1aa1c54916f408e7f2d1e016da0acefc725f7170b67a292e256') build() { cd "${srcdir}" diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD new file mode 100644 index 000000000..b646e99cc --- /dev/null +++ b/testing/libgpod/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164295 2012-07-29 23:15:52Z tomegun $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libgpod +pkgver=0.8.2 +pkgrel=6 +pkgdesc="A shared library to access the contents of an iPod" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') +optdepends=('gtk-sharp-2: Mono bindings' + 'python2-gobject2: python bindings') +url="http://www.gtkpod.org/libgpod/" +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \ + --enable-udev --with-python=/usr/bin/python2 + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD new file mode 100644 index 000000000..2d9547c84 --- /dev/null +++ b/testing/libimobiledevice/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 164283 2012-07-29 21:08:37Z eric $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=libimobiledevice +pkgver=1.1.4 +pkgrel=1 +pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" +url="http://libimobiledevice.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +depends=('usbmuxd' 'gnutls' 'libgcrypt') +options=('!libtool') +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) + +build() { + cd "$pkgname-$pkgver" + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} +md5sums=('3f28cbc6a2e30d34685049c0abde5183') diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch new file mode 100644 index 000000000..c56b095db --- /dev/null +++ b/testing/libimobiledevice/swig-version-check.patch @@ -0,0 +1,14 @@ +diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure +--- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 ++++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 +@@ -3477,9 +3477,7 @@ + if test -z "$available_patch" ; then + available_patch=0 + fi +- if test $available_major -ne $required_major \ +- -o $available_minor -ne $required_minor \ +- -o $available_patch -lt $required_patch ; then ++ if test $available_major -lt $required_major ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 + $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} + SWIG=false diff --git a/testing/libxrandr/PKGBUILD b/testing/libxrandr/PKGBUILD new file mode 100644 index 000000000..ccddaba57 --- /dev/null +++ b/testing/libxrandr/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164269 2012-07-29 11:06:35Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=libxrandr +pkgver=1.4.0 +pkgrel=1 +pkgdesc="X11 RandR extension library" +arch=('i686' 'x86_64') +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('libxext' 'libxrender' 'randrproto>=1.4.0') +makedepends=('xorg-util-macros') +options=('!libtool') +source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) +sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3') + +build() { + cd "${srcdir}/libXrandr-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/libXrandr-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD new file mode 100644 index 000000000..bd2a3a62e --- /dev/null +++ b/testing/rhythmbox/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 164297 2012-07-29 23:16:02Z tomegun $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rhythmbox +pkgver=2.97 +pkgrel=2 +pkgdesc="An iTunes-like music playback and management application" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.rhythmbox.org" +depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' + 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz4' 'libnotify' 'libpeas' 'libwebkit3' + 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' + 'tdb' 'libdiscid') +makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala') +optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'brasero: cd burning') +options=('!libtool' '!emptydirs') +install=rhythmbox.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('b52567cf45bf13c0452593da7f907920bd4cf31916ca8dcd15d555336b4947e4') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/rhythmbox \ + --localstatedir=/var --disable-static \ + --enable-daap --enable-python --enable-musicbrainz \ + --with-mdns=avahi --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install new file mode 100644 index 000000000..e02ee2c16 --- /dev/null +++ b/testing/rhythmbox/rhythmbox.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD index 06cf88c0a..b3642550e 100644 --- a/testing/upower/PKGBUILD +++ b/testing/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162916 2012-07-03 23:39:56Z tomegun $ +# $Id: PKGBUILD 164296 2012-07-29 23:15:56Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.17 -pkgrel=1 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" diff --git a/testing/usbmuxd/85-usbmuxd.rules b/testing/usbmuxd/85-usbmuxd.rules new file mode 100644 index 000000000..ec9f72501 --- /dev/null +++ b/testing/usbmuxd/85-usbmuxd.rules @@ -0,0 +1,9 @@ +# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd) + +# Forces iDevices to the last USB configuration and runs usbmuxd +TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux" +LABEL="usbmuxd_systemd_end" + +# Exit usbmuxd when the last device is removed +ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x" diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD new file mode 100644 index 000000000..6385ba910 --- /dev/null +++ b/testing/usbmuxd/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 164299 2012-07-29 23:16:20Z tomegun $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=usbmuxd +pkgver=1.0.8 +pkgrel=1 +pkgdesc="USB Multiplex Daemon" +url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" +arch=('i686' 'x86_64') +license=('GPL2' 'GPL3' 'LGPL2.1') +depends=('libusb' 'libplist') +makedepends=('cmake') +install=usbmuxd.install +source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2" + 'usbmuxd.service' + '85-usbmuxd.rules') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + echo "${pkgver}" > version.tag + mkdir build + cd build + cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install + + # fix udev dir being hardcoded + mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" + rmdir "${pkgdir}/lib" + # install systemd service file + install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service + # use udev rule that works with systemd + install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ +} +md5sums=('87fd27773a84e97ac6e2dc28b08d682e' + 'dae0660f972510a6483992b5b81e1b5a' + 'dc4b2893651149eccbf7b2c8467cd288') diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install new file mode 100644 index 000000000..1a4859674 --- /dev/null +++ b/testing/usbmuxd/usbmuxd.install @@ -0,0 +1,19 @@ +post_install() { + groupadd -g 140 usbmux &>/dev/null + useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null + passwd -l usbmux &>/dev/null +} + +post_upgrade() { + getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null + getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null +} + +post_remove() { + if getent passwd usbmux >/dev/null 2>&1; then + userdel usbmux + fi + if getent group usbmux >/dev/null 2>&1; then + groupdel usbmux + fi +} diff --git a/testing/usbmuxd/usbmuxd.service b/testing/usbmuxd/usbmuxd.service new file mode 100644 index 000000000..fbebf65b9 --- /dev/null +++ b/testing/usbmuxd/usbmuxd.service @@ -0,0 +1,5 @@ +[Unit] +Description=iOS USB Muxer + +[Service] +ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux |
