From 01b47af6474ac094ec199c7d75208874f8842d87 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 22:33:36 +0000 Subject: Tue May 10 22:33:36 UTC 2011 --- extra/apache/PKGBUILD | 27 +++++++------ extra/gnome-python-desktop/PKGBUILD | 20 +++------- extra/java-commons-daemon/PKGBUILD | 49 +++++++++++++++++++++++ extra/lablgtk2/PKGBUILD | 21 +++++----- extra/libgme/PKGBUILD | 21 +++++----- extra/libgnome/PKGBUILD | 14 +++---- extra/libmtp/PKGBUILD | 21 +++++----- extra/libxext/PKGBUILD | 6 +-- extra/ocaml/PKGBUILD | 26 ++++++------ extra/ocaml/fix-ocaml-binutils-2.21.patch | 66 +++++++++++++++++++++++++++++++ extra/postfix/PKGBUILD | 8 ++-- extra/sane/PKGBUILD | 35 +++++++++------- extra/sane/libv4l-0.8.3.patch | 64 ++++++++++++++++++++++++++++++ extra/sane/sane.install | 10 ++--- extra/tomcat-native/PKGBUILD | 32 +++++++++++++++ extra/xf86-input-acecad/PKGBUILD | 29 ++++---------- extra/xf86-input-aiptek/PKGBUILD | 29 ++++---------- extra/xf86-input-void/PKGBUILD | 28 ++++--------- 18 files changed, 336 insertions(+), 170 deletions(-) create mode 100644 extra/java-commons-daemon/PKGBUILD create mode 100644 extra/ocaml/fix-ocaml-binutils-2.21.patch create mode 100644 extra/sane/libv4l-0.8.3.patch create mode 100644 extra/tomcat-native/PKGBUILD (limited to 'extra') diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 7afa2ad23..ab87adbbb 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96448 2010-10-21 09:16:04Z jgc $ +# $Id: PKGBUILD 123237 2011-05-09 13:25:58Z jgc $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apache pkgver=2.2.17 -pkgrel=1 +pkgrel=2 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') @@ -18,7 +18,7 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf etc/logrotate.d/httpd) depends=('openssl' 'zlib' 'apr-util' 'pcre') optdepends=('lynx: apachectl status') -_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02 +_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 ${_itkurl}/02-rename-prefork-to-itk.patch ${_itkurl}/03-add-mpm-to-build-system.patch @@ -29,21 +29,23 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 ${_itkurl}/08-max-clients-per-vhost.patch ${_itkurl}/09-capabilities.patch ${_itkurl}/10-nice.patch + ${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch apachectl-confd.patch apache.conf.d httpd.logrotate httpd arch.layout) md5sums=('16eadc59ea6b38af33874d300973202e' - 'db42cfcc18ae1c32aaaff2347e35b79d' - '131408ad4dc7b18547b4e062e7e495ab' - 'ee488f391054d528547c3a372faa2aa7' - 'b202944761b2f0516196488b12504236' - '78fa15f8ca3a284b7d71f942e24e47fb' - 'd33e39350e987721d50e6fb8e164ab6b' - '9f7a8935f9cabc7b46d0052906634cef' - '1b28e3363e1b0d05b738a21e7ddd264f' - 'd9667fcd2ffecc63e446edd4d6666731' + 'f1d9d41360908ceb2374da55ae99197a' + 'cdfa04985a0efa850976aef01c2a0c40' + '0930d2d0612eb0a53a0d00aea7e8687f' + '3a0c29bb91442c33ea73ebbe072af922' + '0ef4729a6f1ffc848ad0e9b440a66f66' + '940944caa948340b11ddae56adaef89b' + 'ce09a987523884de8838f73dc8ec0d19' + 'e75b7dd8d8afcd299ba4ab2ab81c11e4' + 'ce1ccc21f3ad8625169c8f62913450ac' + '1e5b222edcfbf99a3edc56fcb2074fbe' '4ac64df6e019edbe137017cba1ff2f51' '08b3c875f6260644f2f52b4056d656b0' '6382331e9700ed9e8cc78ea51887b537' @@ -77,6 +79,7 @@ build() { patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" patch -Np1 -i "${srcdir}/09-capabilities.patch" patch -Np1 -i "${srcdir}/10-nice.patch" + patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" autoconf fi diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index af4e15736..bee9fec5d 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 122148 2011-05-02 13:38:16Z jgc $ +# $Id: PKGBUILD 123201 2011-05-09 08:52:42Z jgc $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint') +pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint') pkgver=2.32.0 -pkgrel=5 +pkgrel=6 arch=(i686 x86_64) license=('GPL' 'LGPL') options=('!libtool') -makedepends=('intltool' 'pkg-config' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg') +makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9') @@ -22,7 +22,7 @@ build() { } package_gnome-python-desktop() { - depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python') + depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint' 'gnome-python') pkgdesc="Python bindings for the GNOME desktop environment" cd "${srcdir}/${pkgbase}-${pkgver}" @@ -107,16 +107,6 @@ package_python-wnck() { make -C wnck install DESTDIR="${pkgdir}" } -package_python-gtksourceview() { - depends=('pygtk' 'gtksourceview' 'python-gnomeprint') - pkgdesc="Python bindings for gtksourceview" - - cd "${srcdir}/${pkgbase}-${pkgver}" - for dir in gtksourceview docs/gtksourceview; do - make -C ${dir} install DESTDIR="${pkgdir}" - done -} - package_python-gnomeprint() { depends=('pygtk' 'libgnomeprintui') pkgdesc="Python bindings for libgnomeprintui" diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD new file mode 100644 index 000000000..91d32fd90 --- /dev/null +++ b/extra/java-commons-daemon/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Guillaume ALAUX +pkgname=('java-commons-daemon' 'java-jsvc') +pkgbase=java-commons-daemon +pkgver=1.0.5 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://commons.apache.org/daemon/" +license=('APACHE') +_libname=commons-daemon +source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) +md5sums=('2fe0a35d4a9c0338ecd45dad20f33662') +makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') + + +build() { + # commons-daemon.jar + cd "${srcdir}/${_libname}-${pkgver}-src" + ant + + # jsvc + cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" + ./configure + make + docbook2man man/jsvc.1.xml +} + +package_java-commons-daemon() { + pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily" + depends=('java-runtime') + + cd "${srcdir}/${_libname}-${pkgver}-src" + + install -Dm755 dist/${_libname}-${pkgver}.jar \ + ${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar + ln -s ${_libname}-${pkgver}.jar \ + ${pkgdir}/usr/share/java/${_libname}.jar +} + +package_java-jsvc() { + pkgdesc="Apache application for making Java applications run on UNIX more easily" + depends=("java-${_libname}" 'libcap') + + # jsvc + cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" + + install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc + install -Dm644 JSVC.1 ${pkgdir}/usr/share/man/man1/JSVC.1 +} + diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index d0d65af8a..074e59069 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 106688 2011-01-17 20:58:22Z tpowa $ +# $Id: PKGBUILD 123211 2011-05-09 10:15:03Z jgc $ #Maintainer: Tobias Powalowski pkgname=lablgtk2 pkgver=2.14.2 -pkgrel=1 +pkgrel=2 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') -url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html" -depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview' 'gtksourceview2') +url="http://lablgtk.forge.ocamlcore.org/" +depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') makedepends=('ocaml') -source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-$pkgver.tar.gz) +source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) options=(!makeflags) +md5sums=('bad77680a72dab8b915cae99d1ec9b1f') build() { - cd $startdir/src/lablgtk-$pkgver - ./configure + cd "${srcdir}/lablgtk-${pkgver}" + ./configure --prefix=/usr make world make opt - make PREFIX=$startdir/pkg/usr LIBDIR=$startdir/pkg/usr/lib/ocaml BINDIR=$startdir/pkg/usr/bin INSTALLDIR=$startdir/pkg/usr/lib/ocaml/lablgtk2 DLLDIR=$startdir/pkg/usr/lib/ocaml/stublibs install -rm -r $startdir/pkg/usr/bin + make DESTDIR="${pkgdir}" install + install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" + rm -r "${pkgdir}/usr/bin" } -md5sums=('bad77680a72dab8b915cae99d1ec9b1f') diff --git a/extra/libgme/PKGBUILD b/extra/libgme/PKGBUILD index 991fa9a9f..87cf33388 100644 --- a/extra/libgme/PKGBUILD +++ b/extra/libgme/PKGBUILD @@ -2,24 +2,23 @@ # Contributer: Emmanuel Gil Peyrot pkgname=libgme -pkgver=0.5.5 -pkgrel=3 +pkgver=0.6.0 +pkgrel=1 pkgdesc="Video game music file emulation/playback library" url="http://game-music-emu.googlecode.com/" license=('LGPL') arch=('i686' 'x86_64') depends=('gcc-libs') makedepends=('cmake') -source=(http://game-music-emu.googlecode.com/files/game-music-emu-${pkgver}.tbz2) -md5sums=("94459001a763fb76209a550a03b7949e") +source=(ftp://ftp.archlinux.org/other/game-music-emu/game-music-emu-${pkgver}.tar.xz) +md5sums=('b72bc337ea4bd6dab7f0288ed4cd598e') build() { - cd "${srcdir}/game-music-emu-${pkgver}" - mkdir build - cd build + cd "${srcdir}/game-music-emu-${pkgver}" + mkdir build + cd build - msg "Starting build process." - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - make - make DESTDIR="${pkgdir}" install + cmake .. -DCMAKE_INSTALL_PREFIX=/usr + make + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD index d989f6512..9c7318fe2 100644 --- a/extra/libgnome/PKGBUILD +++ b/extra/libgnome/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 99674 2010-11-16 00:21:13Z ibiru $ +# $Id: PKGBUILD 123229 2011-05-09 11:06:37Z jgc $ # Maintainer: Jan de Groot pkgbase=libgnome pkgname=('libgnome' 'libgnome-data') -pkgver=2.32.0 -pkgrel=3 +pkgver=2.32.1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('intltool' 'gnome-vfs>=2.24.3' 'libbonobo>=2.32.0' 'gconf>=2.32.0' 'gvfs>=1.6.6' 'libcanberra>=0.25') +makedepends=('intltool' 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02') +sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -23,7 +23,7 @@ build() { package_libgnome() { pkgdesc="Common libraries for GNOME" - depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.3' 'libbonobo>=2.32.0' 'gconf>=2.32.0' 'gvfs>=1.6.6' 'libcanberra>=0.25') + depends=("libgnome-data=${pkgver}" 'gnome-vfs>=2.24.4' 'libbonobo>=2.32.1' 'gconf>=2.32.3' 'gvfs>=1.8.1' 'libcanberra>=0.28') cd "${srcdir}/${pkgbase}-${pkgver}" @@ -44,6 +44,6 @@ package_libgnome-data() { done install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain libgnome-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index e549fa123..c62b8199e 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,32 +1,29 @@ -# $Id: PKGBUILD 101397 2010-11-29 04:35:05Z allan $ +# $Id: PKGBUILD 123216 2011-05-09 10:21:51Z jgc $ # Contributor: damir # Contributor: Kevin Edmonds pkgname=libmtp -pkgver=1.0.2 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" license=('LGPL') depends=('libusb-compat') makedepends=('doxygen') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('cdc1cc6afa6be287ff6bc331e71bdc47') options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('7d3c624d768adba8537f8bc9c0a82cbf') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -D -m0644 libmtp.rules \ - $pkgdir/lib/udev/rules.d/52-libmtp.rules - install -D -m0644 libmtp.fdi \ - $pkgdir/usr/share/hal/fdi/information/20thirdparty/libmtp.fdi + install -D -m0644 libmtp.rules "${pkgdir}/lib/udev/rules.d/52-libmtp.rules" } diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD index d70a183ce..af85db2de 100644 --- a/extra/libxext/PKGBUILD +++ b/extra/libxext/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97797 2010-11-01 22:17:28Z jgc $ +# $Id: PKGBUILD 123247 2011-05-09 13:35:22Z jgc $ # Maintainer: Jan de Groot pkgname=libxext -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="X11 miscellaneous extensions library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2) -sha1sums=('090d7109c5fffde8a0063e10f22f3e2ec48cf19e') +sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d') build() { cd "${srcdir}/libXext-${pkgver}" diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 7b0cd86d4..f460befbc 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88099 2010-08-19 13:05:24Z tpowa $ +# $Id: PKGBUILD 123206 2011-05-09 09:44:39Z jgc $ # Maintainer: Tobias Powalowski pkgname=ocaml pkgver=3.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') @@ -11,19 +11,23 @@ url="http://caml.inria.fr/" depends=('gdbm') makedepends=('tk' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-3.12/$pkgname-$pkgver.tar.gz) +source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz + fix-ocaml-binutils-2.21.patch) options=('!makeflags' '!emptydirs') +md5sums=('3ba7cc65123c3579f14e7c726d3ee782' + '8c664a0a346424ea2ec6fc6f713170c6') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch" ./configure -prefix /usr - make world.opt || return 1 - make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install || return 1 + make world.opt + make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install -# Save >10MB with this one, makepkg only strips debug symbols. - find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; + # Save >10MB with this one, makepkg only strips debug symbols. + #find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; -# install license -install -D -m 644 $startdir/src/$pkgname-$pkgver/LICENSE $startdir/pkg/usr/share/licenses/ocaml/LICENSE + # install license + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('3ba7cc65123c3579f14e7c726d3ee782') diff --git a/extra/ocaml/fix-ocaml-binutils-2.21.patch b/extra/ocaml/fix-ocaml-binutils-2.21.patch new file mode 100644 index 000000000..fa7664cec --- /dev/null +++ b/extra/ocaml/fix-ocaml-binutils-2.21.patch @@ -0,0 +1,66 @@ +From: Stephane Glondu +Date: Tue, 8 Mar 2011 21:17:40 +0100 +Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: http://caml.inria.fr/mantis/view.php?id=5237 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404 +Authors: Eric Cooper, spiralvoice +Reviewed-by: Stéphane Glondu +--- + asmcomp/amd64/emit.mlp | 13 +++++++------ + asmcomp/i386/emit.mlp | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp +index 4a3f844..525c6e6 100644 +--- a/asmcomp/amd64/emit.mlp ++++ b/asmcomp/amd64/emit.mlp +@@ -679,17 +679,18 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); ++ begin match Config.system with ++ "linux" | "gnu" -> ++ ` .type {emit_symbol fundecl.fun_name},@function\n`; ++ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` ++ | _ -> () ++ end; + if !float_constants <> [] then begin + if macosx + then ` .literal8\n` + else ` .section .rodata.cst8,\"a\",@progbits\n`; + List.iter emit_float_constant !float_constants +- end; +- match Config.system with +- "linux" | "gnu" -> +- ` .type {emit_symbol fundecl.fun_name},@function\n`; +- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ end + + (* Emission of data *) + +diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp +index 2992f29..0b1252c 100644 +--- a/asmcomp/i386/emit.mlp ++++ b/asmcomp/i386/emit.mlp +@@ -905,12 +905,12 @@ let fundecl fundecl = + emit_all true fundecl.fun_body; + List.iter emit_call_gc !call_gc_sites; + emit_call_bound_errors (); +- List.iter emit_float_constant !float_constants; +- match Config.system with ++ begin match Config.system with + "linux_elf" | "bsd_elf" | "gnu" -> + ` .type {emit_symbol fundecl.fun_name},@function\n`; + ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n` +- | _ -> () ++ | _ -> () end; ++ List.iter emit_float_constant !float_constants + + + (* Emission of data *) +-- diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index d38b2648c..667c3f6dc 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 117190 2011-03-29 13:39:06Z bisson $ +# $Id: PKGBUILD 123242 2011-05-09 13:33:46Z bisson $ # Contributor: Jeff Brodnax # Maintainer: Gaetan Bisson # Maintainer: Paul Mattal pkgname=postfix -pkgver=2.8.2 -pkgrel=3 +pkgver=2.8.3 +pkgrel=1 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('224e0b6dd161f4648114de8902124c9dec64aa8c' +sha1sums=('2604066f158f5327449960afd6334b996dc01799' '5fc3de6c7df1e5851a0a379e825148868808318b' '050e6afc5886049682c945ce147b3c47fe113939') diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index e5b28cdd7..5fbfd67f3 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 110715 2011-02-21 19:15:42Z tpowa $ +# $Id: PKGBUILD 123295 2011-05-09 20:29:22Z andrea $ # Maintainer: Tobias Powalowski -# Contributed by Sarah Hay , Tobias Powalowski , Simo L. , eric +# Contributor: Sarah Hay +# Contributor: Simo L. +# Contributor: eric pkgname=sane pkgver=1.0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Scanner Access Now Easy" -url="http://www.sane-project.org" +url="http://www.sane-project.org/" arch=('i686' 'x86_64') license=('GPL') depends=('libtiff>=3.9.2-2' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') @@ -14,12 +16,21 @@ makedepends=('texlive-latexextra') install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz - sane.xinetd) + 'sane.xinetd' + 'libv4l-0.8.3.patch') options=(!libtool) build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-docdir=/usr/share/doc/sane --enable-avahi + + patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-docdir=/usr/share/doc/sane \ + --enable-avahi \ + --disable-locking make } @@ -33,16 +44,10 @@ package () { "${pkgdir}/lib/udev/rules.d/53-sane.rules" # fix udev rules sed -i 's|NAME="%k", ||g' ${pkgdir}/lib/udev/rules.d/53-sane.rules - # fix group on /var/lock - mkdir -p "${pkgdir}/var/lock/sane" - chgrp 0 "${pkgdir}/var" - chmod 755 "${pkgdir}/var" - chmod 1777 "${pkgdir}/var/lock" - chgrp 0 "${pkgdir}/var/lock" - chmod 775 "${pkgdir}/var/lock/sane" - chgrp 96 "${pkgdir}/var/lock/sane" + # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" } md5sums=('fadf56a60f4776bfb24491f66b617cf5' - 'da946cc36fb83612162cf9505986d4b2') + 'da946cc36fb83612162cf9505986d4b2' + 'e645a8921cff9f18ffbdabb2ed885060') diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch new file mode 100644 index 000000000..4e240e0cf --- /dev/null +++ b/extra/sane/libv4l-0.8.3.patch @@ -0,0 +1,64 @@ +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE +Date: Wed Feb 16 19:37:43 2011 +0100 + + Fix v4l build with libv4l 0.8.3+ + + (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) + + Conflicts: + + ChangeLog + + Signed-off-by: Nils Philippsen +--- + backend/v4l.c | 3 +-- + backend/v4l.h | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backend/v4l.c b/backend/v4l.c +index 6510ef0..38595ed 100644 +--- a/backend/v4l.c ++++ b/backend/v4l.c +@@ -84,9 +84,8 @@ + #include "../include/sane/sanei_config.h" + #define V4L_CONFIG_FILE "v4l.conf" + +-#include "v4l.h" +- + #include ++#include "v4l.h" + + static const SANE_Device **devlist = NULL; + static int num_devices; +diff --git a/backend/v4l.h b/backend/v4l.h +index 588b96e..6aee586 100644 +--- a/backend/v4l.h ++++ b/backend/v4l.h +@@ -29,6 +29,7 @@ + #ifndef v4l_h + #define v4l_h + ++#ifndef __LINUX_VIDEODEV_H + /* Kernel interface */ + /* Only the stuff we need. For more features, more defines are needed */ + +@@ -165,7 +166,7 @@ struct video_channel + + + /* end of kernel interface */ +- ++#endif /* !__LINUX_VIDEODEV_H */ + + #include <../include/sane/sane.h> + +-- +1.7.4 + diff --git a/extra/sane/sane.install b/extra/sane/sane.install index 850bd3255..cbecf7b2e 100644 --- a/extra/sane/sane.install +++ b/extra/sane/sane.install @@ -1,6 +1,5 @@ -# arg 1: the new package version post_install() { -getent group scanner >/dev/null || usr/sbin/groupadd -g 96 scanner + getent group scanner >/dev/null 2>&1 || groupadd -g 96 scanner &>/dev/null /bin/cat </dev/null +post_remove() { + if getent group scanner >/dev/null 2>&1; then + groupdel scanner + fi } diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD new file mode 100644 index 000000000..8572c26fc --- /dev/null +++ b/extra/tomcat-native/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Guillaume ALAUX +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua + +pkgname=tomcat-native +pkgver=1.1.20 +pkgrel=1 +pkgdesc="The Apache Tomcat Native Library" +arch=('i686' 'x86_64') +url="http://tomcat.apache.org/" +license="Apache" +depends=('tomcat' 'apr' 'openssl') +makedepends=('java-environment') +source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) +md5sums=('fb2b9d073cb6575c2d0020eda266ca0c') + +build() { + cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" + + ./configure \ + --prefix=/usr \ + --with-java-home=${JAVA_HOME} \ + --with-apr=/usr \ + --with-ssl=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native" + + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/{bin,include} +} diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD index 9a9ed57a1..9ec6a2995 100644 --- a/extra/xf86-input-acecad/PKGBUILD +++ b/extra/xf86-input-acecad/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115526 2011-03-18 10:32:21Z andyrtr $ +# $Id: PKGBUILD 123257 2011-05-09 13:44:31Z jgc $ # Maintainer: Jan de Groot pkgname=xf86-input-acecad -_gitdate=20110318 -pkgver=1.4.99_git${_gitdate} # see configure.ac +pkgver=1.5.0 pkgrel=1 pkgdesc="X.Org acecad tablet input driver" arch=(i686 x86_64) @@ -14,31 +13,17 @@ makedepends=('xorg-server-devel') conflicts=('xorg-server<1.10.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2) -sha1sums=('f1aa0c13542242316ebd401369959f6c55ae8222') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-acecad - cd xf86-input-acecad - git archive --prefix=xf86-video-acecad-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1') build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-acecad-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-acecad-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD index 11f20cb39..cd659b10a 100644 --- a/extra/xf86-input-aiptek/PKGBUILD +++ b/extra/xf86-input-aiptek/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115529 2011-03-18 10:37:30Z andyrtr $ +# $Id: PKGBUILD 123262 2011-05-09 13:47:41Z jgc $ #Maintainer: Jan de Groot pkgname=xf86-input-aiptek -_gitdate=20110318 -pkgver=1.3.99_git${_gitdate} # see configure.ac +pkgver=1.4.0 pkgrel=1 pkgdesc="X.Org Aiptek USB Digital Tablet input driver" arch=(i686 x86_64) @@ -14,31 +13,17 @@ makedepends=('pkgconfig' 'xorg-server-devel') conflicts=('xorg-server<1.10.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2) -md5sums=('0dc6fe834142ca7a4bec8fceb0885a15') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-aiptek - cd xf86-input-aiptek - git archive --prefix=xf86-video-aiptek-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('19b7d42f35aff866de96d95941dce2b4682ad923') build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-aiptek-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-aiptek-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD index 6c4a38685..004bf14a9 100644 --- a/extra/xf86-input-void/PKGBUILD +++ b/extra/xf86-input-void/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115535 2011-03-18 10:46:45Z andyrtr $ +# $Id: PKGBUILD 123252 2011-05-09 13:38:43Z jgc $ #Maintainer: Jan de Groot pkgname=xf86-input-void -_gitdate=20110318 -pkgver=1.3.1.99_git${_gitdate} # see configure.ac +pkgver=1.4.0 pkgrel=1 pkgdesc="X.org void input driver" arch=(i686 x86_64) @@ -14,31 +13,18 @@ makedepends=('xorg-server-devel') conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2) -md5sums=('0ec2820fc178138d393fd248f56b8754') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-void - cd xf86-input-void - git archive --prefix=xf86-video-void-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-void-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-void-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install -- cgit v1.2.3-54-g00ecf