diff options
52 files changed, 1259 insertions, 174 deletions
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index c23b703de..aeb5968f6 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -4,16 +4,16 @@ # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1.1 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license="GPL" -depends=('xulrunner' 'libglade' 'chmlib') +depends=('xulrunner>=2.0' 'libglade' 'chmlib') makedepends=('intltool' 'cmake') source=(http://chmsee.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('5ba68ccee32ba782486badc025842ccf') +md5sums=('7c226e6f518284a040ad3b9433d5e218') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 3d2e3a876..489dcbaa8 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 36041 2010-12-25 20:18:47Z lfleischer $ +# $Id: PKGBUILD 47144 2011-05-17 17:39:51Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.4.4 -pkgrel=2 +pkgver=0.5.0 +pkgrel=1 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' license=('GPL2') -depends=('gtk2' 'libsamplerate' 'alsa-lib') -makedepends=('gtk2' 'libsamplerate' 'libvorbis' 'libmad' 'flac' 'curl' 'alsa-lib' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse') +depends=('gtk2' 'libsamplerate' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' + 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip') optdepends=('libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' 'flac: for FLAC playback' @@ -28,12 +29,12 @@ optdepends=('libvorbis: for Ogg Vorbis playback' options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('546e63d456d6a5625461019b15501e38') +md5sums=('cf45af00c34f855db87a1056d6e2f1af') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-converter make } diff --git a/community/eterm/PKGBUILD b/community/eterm/PKGBUILD index d2c6d7dd6..cfb3d5613 100644 --- a/community/eterm/PKGBUILD +++ b/community/eterm/PKGBUILD @@ -1,10 +1,11 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=eterm -pkgver=0.9.5 -pkgrel=4 +pkgver=0.9.6 +pkgrel=1 pkgdesc="A vt102 terminal emulator intended as a replacement for xterm." arch=('i686' 'x86_64') url="http://www.eterm.org/" @@ -12,7 +13,7 @@ license=('custom') depends=('freetype2>=2.3.5' 'libast>=0.7' 'libxmu' 'libxres') options=('!libtool') source=(http://www.eterm.org/download/Eterm-${pkgver}.tar.gz) -md5sums=('87220a61f763d111a4f5fc88ef9e50f1') +md5sums=('90e424584c22d4050496874d14f78bb1') build() { cd ${srcdir}/Eterm-${pkgver} @@ -32,3 +33,4 @@ package() { install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } + diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD index 6b6ef848e..bdf6bd5c1 100644 --- a/community/libexosip2/PKGBUILD +++ b/community/libexosip2/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 29647 2010-10-18 08:56:03Z spupykin $ +# $Id: PKGBUILD 47119 2011-05-17 07:23:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=libexosip2 -pkgver=3.3.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/exosip/" license=('GPL') -depends=('libosip2>=3.1.0' 'openssl') +depends=('libosip2>=3.5.0' 'openssl') options=(!libtool) source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz) -md5sums=('a2739067b51c1e417c5aef9606b285b2') +md5sums=('51e85725571870614e448f63c33c8996') build() { cd "$srcdir/libeXosip2-${pkgver/_/-}" ./configure --prefix=/usr make +} +package() { + cd "$srcdir/libeXosip2-${pkgver/_/-}" make DESTDIR="$pkgdir" install } diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index 904afdb94..03ba4d40c 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 43994 2011-04-01 15:09:07Z spupykin $ +# $Id: PKGBUILD 47124 2011-05-17 07:27:45Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Darwin Bautista <djclue917@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone pkgver=3.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64') url="http://www.linphone.org/index.php/eng" @@ -30,5 +29,9 @@ build() { --libexecdir=/usr/lib/$pkgname \ --enable-external-mediastreamer --enable-external-ortp make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index e28da76c2..7a9008e74 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> pkgname=paraview -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc='Parallel Visualization Application using VTK.' arch=('i686' 'x86_64') url='http://www.paraview.org' @@ -15,7 +15,7 @@ source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" "${pkgname}.profile" "${pkgname}.png" "${pkgname}.desktop") -md5sums=('5369f05667f1ad8aaca7a879208aeb3c' +md5sums=('d8a9d4a997a720589ffd57568bcdd449' '534ef49689a7f630c98380f5ab4bf915' 'db623002bc71a257ddfdd0c9c7b14c3f' '4e4b7172ed18171c37446fd7c4f1e8f5') @@ -23,6 +23,10 @@ md5sums=('5369f05667f1ad8aaca7a879208aeb3c' build() { cd ParaView-${pkgver} + sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx + sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx + sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx + # Paraview wants to be built out of source mkdir -p build cd build diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 4dc83e425..2345ec8c1 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.28.00c +pkgver=5.28.00d pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('0e997f14cb1c671987e1780d2b6375f8' +md5sums=('53505fcb256df38526d446916e6efc15' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index d73767ffb..de3b09e1e 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $ +# $Id: PKGBUILD 47152 2011-05-17 18:01:10Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.6 +pkgver=4.0.8 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' 'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - 18-system-xorg.patch gcc46.patch) + 18-system-xorg.patch) _kernver=2.6.38-ARCH build() { @@ -25,7 +25,6 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/18-system-xorg.patch" - patch -Np1 -i "$srcdir/gcc46.patch" cp "$srcdir/LocalConfig.kmk" . @@ -171,6 +170,7 @@ package_virtualbox-guest-additions(){ install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" + ln -s /usr/lib/xorg/modules/dri "$pkgdir/usr/lib/dri" install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" } @@ -203,8 +203,8 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('cf274f0585c35c5c137e2bd9b48b462a' - '7d3ee86e998fa24b07a157add9fb7766' +md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' + '39712ccbc16b04c1cda209ae16446bf2' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' @@ -212,5 +212,4 @@ md5sums=('cf274f0585c35c5c137e2bd9b48b462a' '9bde5b7dfba5abcd49768052c5409800' 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b' - 'a28b48ff01149acbca4bbe6a676a06da') + '8a22b33c9dfaf8fb79bb2d26304e650b') diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index bfee4e73f..e177e74f5 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 105458 2011-01-09 04:03:58Z stephane $ +# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.49 -pkgrel=2 +pkgver=2.2.51 +pkgrel=1 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/acl" license=('LGPL') -depends=('attr>=2.4.41') +depends=('attr>=2.4.46') replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') -source=(http://mirrors.zerg.biz/nongnu/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) -sha256sums=('b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} export INSTALL_USER=root INSTALL_GROUP=root ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib @@ -28,6 +28,7 @@ package() { make DIST_ROOT="${pkgdir}" install install-lib install-dev - rm ${pkgdir}/lib/libacl.a + # tidy up + rm -f ${pkgdir}/lib/libacl.a chmod 0755 ${pkgdir}/lib/libacl.so.*.*.* } diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index f8b942259..30f3ad81a 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 115738 2011-03-20 22:30:28Z allan $ +# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.44 -pkgrel=3 +pkgver=2.4.46 +pkgrel=1 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64') -url="http://oss.sgi.com/projects/xfs/" +url="http://savannah.nongnu.org/projects/attr" license=('LGPL') depends=('glibc') makedepends=('gettext') @@ -13,32 +13,25 @@ replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/attr/attr-${pkgver}.src.tar.gz) -sha256sums=('e01fa00686072a02dddf994e6217be950f51c1dc0852ad2e210c48b6e8de793a') +source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') build() { - cd $srcdir/attr-$pkgver + cd "${srcdir}"/${pkgname}-${pkgver} - # prevent binaries being owned by nobody:nobody - sed -i 's#-o $(PKG_USER) -g $(PKG_GROUP)##' include/buildmacros - - autoconf - ./configure --prefix=/usr - sed -i -e 's/man2//g' man/Makefile + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib make } package() { - cd $srcdir/attr-$pkgver - make prefix=${pkgdir}/usr install install-lib install-dev - - # tidy up - cd "${pkgdir}" + cd "${srcdir}"/${pkgname}-${pkgver} - install -dm755 lib - mv -v usr/lib/libattr.so* lib/ - ln -sv ../../lib/libattr.so.1 usr/lib/libattr.so + make DIST_ROOT="${pkgdir}" install install-lib install-dev - mv -v usr/libexec/libattr.{a,la} usr/lib/ - rm -rvf usr/libexec + # tidy up + rm -f "${pkgdir}"/lib/libattr.a + chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.* + # remove conflicting manpages + rm -rf "${pkgdir}"/usr/share/man/man2 } diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 67006a82a..0da5b0175 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 103928 2010-12-23 22:10:05Z thomas $ +# $Id: PKGBUILD 123894 2011-05-14 09:00:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea' +sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD index 85ed0d2e0..493598561 100644 --- a/core/libgssglue/PKGBUILD +++ b/core/libgssglue/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 102146 2010-12-06 09:49:56Z allan $ +# $Id: PKGBUILD 123644 2011-05-12 06:23:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libgssglue pkgver=0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries" arch=('i686' 'x86_64') url="http://www.citi.umich.edu/projects/nfsv4/linux/" @@ -15,7 +15,7 @@ options=('!libtool') source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz gssapi_mech.conf) md5sums=('ce1b4c758e6de01b712d154c5c97e540' - '234b9cca75a33af98eda3f1683756879') + '080be866717e4e06fa6f7d6f43cb395a') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/libgssglue/gssapi_mech.conf b/core/libgssglue/gssapi_mech.conf index f71aca08e..9a832ee1b 100644 --- a/core/libgssglue/gssapi_mech.conf +++ b/core/libgssglue/gssapi_mech.conf @@ -15,8 +15,8 @@ # library initialization function # ================================ ========================== # The MIT K5 gssapi library, use special function for initialization. -#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init -/usr/lib/libgssapi.so mechglue_internal_krb5_init +/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init +#/usr/lib/libgssapi.so mechglue_internal_krb5_init # # The SPKM3 gssapi library function. Use the function spkm3_gss_initialize. # /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize diff --git a/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff new file mode 100644 index 000000000..e75499e8e --- /dev/null +++ b/core/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff @@ -0,0 +1,17 @@ +Do not issue an error message when unable to remove .cache on read-only fs. +=================================================================== +RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v +retrieving revision 1.49 +retrieving revision 1.50 +diff -u -r1.49 -r1.50 +--- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 ++++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 +@@ -108,7 +108,7 @@ + log_very_verbose("Obtaining device list from " + "udev. Removing obolete %s.", + pf->file); +- if (unlink(pf->file) < 0) ++ if (unlink(pf->file) < 0 && errno != EROFS) + log_sys_error("unlink", pf->file); + } + return 1; diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 3a946ff04..e7129b765 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109502 2011-02-10 10:44:18Z eric $ +# $Id: PKGBUILD 123786 2011-05-13 00:53:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.84 +pkgver=2.02.85 _pkgverlvm=${pkgver} pkgrel=1 arch=('i686' 'x86_64') @@ -14,15 +14,21 @@ groups=('base') conflicts=('mkinitcpio<0.5.99') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install - lvm2_hook) -md5sums=('8b4e0897ee48f02c0dff11940e44e23b' 'e29bc80d636ed17b617d9b384a5f3aa0'\ - '7103e3fef1180478811ac4e32aec540d') -sha1sums=('6d92f4474f93c7d3824a0eb3469c7e4f9ef8f1d4' '662fc54ce291fd79bd09701e4c3e10854f325282'\ - '769767d84c73674cbb68c765460e57c428c314a0') + lvm2_hook + Be-quiet-on-removing-cache-on-read-only-fs.diff) +md5sums=('91785ca438e5ce679dd3a386b183d552' + 'e29bc80d636ed17b617d9b384a5f3aa0' + 'cf05f2c7281e24269ea9dcc6b4e106ba' + '6db89da27928d2415a8e26cd0a842712') +sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' + '662fc54ce291fd79bd09701e4c3e10854f325282' + '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' + '6d7dd04be291d7537235704c816a701fd5beacc0') build() { cd "${srcdir}/LVM2.${_pkgverlvm}" sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff unset LDFLAGS ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib \ diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index d6d1c1f94..86d2ea582 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -18,6 +18,7 @@ run_hook () [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET fi } diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD index 4f2889baf..b9aa75ad5 100644 --- a/core/lzo2/PKGBUILD +++ b/core/lzo2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 100405 2010-11-23 12:35:30Z stephane $ +# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $ # Contributor: Low Kian Seong <fastmail_low@speedymail.org> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=lzo2 -pkgver=2.04 +pkgver=2.05 pkgrel=1 pkgdesc="Portable lossless data compression library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc') source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) options=(!libtool) -sha1sums=('f5bf5c7ae4116e60513e5788d156ef78946677e7') +md5sums=('c67cda5fa191bab761c7cb06fe091e36') build() { cd "${srcdir}/lzo-${pkgver}" diff --git a/core/udev/01-settle.patch b/core/udev/01-settle.patch new file mode 100644 index 000000000..88e23d2a2 --- /dev/null +++ b/core/udev/01-settle.patch @@ -0,0 +1,68 @@ +From 2738ec2cf721db0c0deac2ba0abdc73cf7739e9f Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay.sievers@vrfy.org> +Date: Mon, 16 May 2011 13:17:48 +0200 +Subject: [PATCH 1/7] udevd: create queue file before daemonizing to reliably + block 'settle' + +--- + udev/udevd.c | 22 ++++++++++++---------- + 1 files changed, 12 insertions(+), 10 deletions(-) + +diff --git a/udev/udevd.c b/udev/udevd.c +index be4b071..258d787 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -1408,6 +1408,13 @@ int main(int argc, char *argv[]) + + udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024); + ++ /* create queue file before signalling 'ready', to make sure we block 'settle' */ ++ udev_queue_export = udev_queue_export_new(udev); ++ if (udev_queue_export == NULL) { ++ err(udev, "error creating queue file\n"); ++ goto exit; ++ } ++ + if (daemonize) { + pid_t pid; + int fd; +@@ -1421,8 +1428,8 @@ int main(int argc, char *argv[]) + rc = 4; + goto exit; + default: +- rc = 0; +- goto exit; ++ rc = EXIT_SUCCESS; ++ goto exit_keep_queue; + } + + setsid(); +@@ -1521,12 +1528,6 @@ int main(int argc, char *argv[]) + goto exit; + } + +- udev_queue_export = udev_queue_export_new(udev); +- if (udev_queue_export == NULL) { +- err(udev, "error creating queue file\n"); +- goto exit; +- } +- + memset(&ep_ctrl, 0, sizeof(struct epoll_event)); + ep_ctrl.events = EPOLLIN; + ep_ctrl.data.fd = fd_ctrl; +@@ -1708,9 +1709,10 @@ int main(int argc, char *argv[]) + } + } + +- udev_queue_export_cleanup(udev_queue_export); +- rc = 0; ++ rc = EXIT_SUCCESS; + exit: ++ udev_queue_export_cleanup(udev_queue_export); ++exit_keep_queue: + if (fd_ep >= 0) + close(fd_ep); + worker_list_cleanup(udev); +-- +1.7.5.1 + diff --git a/core/udev/02-settle.patch b/core/udev/02-settle.patch new file mode 100644 index 000000000..4bcb7fdde --- /dev/null +++ b/core/udev/02-settle.patch @@ -0,0 +1,29 @@ +From 12f79fb0b9c919787d8a7d4307895d3d6b4b029b Mon Sep 17 00:00:00 2001 +From: Nix <nix@esperi.org.uk> +Date: Mon, 16 May 2011 22:51:38 +0200 +Subject: [PATCH 7/7] libudev: queue - accept NULL passed into + udev_queue_export_cleanup() + +--- + libudev/libudev-queue-private.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c +index 0dcf9b0..6e13d8a 100644 +--- a/libudev/libudev-queue-private.c ++++ b/libudev/libudev-queue-private.c +@@ -104,9 +104,10 @@ void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export) + { + char filename[UTIL_PATH_SIZE]; + ++ if (udev_queue_export == NULL) ++ return; + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL); + unlink(filename); +- + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL); + unlink(filename); + } +-- +1.7.5.1 + diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 44c2cf9d7..d596361c9 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123587 2011-05-11 16:38:57Z tomegun $ +# $Id: PKGBUILD 124183 2011-05-17 13:17:56Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -7,7 +7,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') pkgver=168 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') @@ -19,10 +19,15 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta 80-drivers.rules 81-arch.rules load-modules.sh - cdsymlinks.sh) + cdsymlinks.sh + 01-settle.patch + 02-settle.patch) build() { cd $srcdir/$pkgbase-$pkgver + # fix https://bugs.archlinux.org/task/24288 + patch -Np1 -i ../01-settle.patch + patch -Np1 -i ../02-settle.patch ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system make @@ -109,8 +114,10 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -md5sums=('4a466078532ab5dd5c35acc3ea2ec9a1' - '4427855146513a4703ab5c7eb8a0156e' - 'f17c99779173ddc79f866cf3a5de5e68' - 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769') +sha256sums=('9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2' + '0cb99cc7cea92238dd6b19a4c104c3b9e9f744c6b9d6b4382c7cd22be18c98f9' + '377c13f20de32776107dddc8324f599f31320e8dd1185e3282856aee5cb08499' + 'c6b41afb24e8f496064d8baad844697a6515cea1b7e0389054cd8a2053477377' + 'cc0d281926bf2f1ac816c0060a2afc59444ddf0f8dab6e2d9924a2a7c8de4a13' + '70d2fd079901bf9940c4811ec91634da0d8b3425ebcdbffeba5a73cb616be650' + 'fe9d1aafb1a620108790d82960577de4eb757450c35a146475aed3f5e9356f1a') diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD index e25c5dd47..7051b8d7d 100644 --- a/extra/farsight2/PKGBUILD +++ b/extra/farsight2/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 124105 2011-05-16 15:51:02Z ibiru $ +# $Id: PKGBUILD 124193 2011-05-17 15:41:27Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: William Díaz <wdiaz@archlinux.us> pkgname=farsight2 pkgver=0.0.28 -pkgrel=1 +pkgrel=2 pkgdesc="Audio/Video conference software for Instant Messengers" arch=('i686' 'x86_64') url="http://farsight.freedesktop.org" license=('LGPL') -depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-python' 'pygobject') +depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0.10-bad' 'gstreamer0.10-python' 'pygobject') +optdepends=('gstreamer0.10-ugly-plugins: h264 codec') options=('!libtool' '!emptydirs') source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('38767e775067270754a32aaf8e3a7db1') diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index a2d9302ee..72fa515e3 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 120955 2011-04-27 19:24:20Z andrea $ +# $Id: PKGBUILD 124232 2011-05-17 19:20:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libvncserver pkgver=0.9.8 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64') url="http://libvncserver.sourceforge.net/" license=('GPL') -depends=('libjpeg' 'zlib') +depends=('libjpeg' 'zlib' 'gnutls') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index 356bda657..1c245bb45 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122421 2011-05-04 06:44:02Z andyrtr $ +# $Id: PKGBUILD 124201 2011-05-17 17:28:05Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori #_gitdate=20090306 -pkgver=0.3.5 #_git${_gitdate} +pkgver=0.3.6 #_git${_gitdate} pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2 #midori-${_gitdate}.tar.bz2 ) -md5sums=('f92f0f11276d63150fd321dc08d575fb') +md5sums=('c4cb0686601b1c470c317de3d3f8e8fd') # source PKGBUILD && mksource mksource() { diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 04e93f2f9..8e1165edc 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110855 2011-02-22 19:17:39Z tpowa $ +# $Id: PKGBUILD 124173 2011-05-17 12:44:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm pkgver=0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) license=('GPL2' 'LGPL2.1') @@ -16,6 +16,7 @@ provides=('qemu') replaces=('kvm') source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) +options=(!strip) build() { @@ -24,7 +25,7 @@ build() ./configure --prefix=/usr \ --sysconfdir=/etc \ --audio-drv-list=alsa,sdl,oss,esd \ - --audio-card-list=ac97,sb16,es1370,adlib \ + --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make } @@ -44,6 +45,13 @@ package() # install udev rules install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done } md5sums=('4ea6f412d85a826e0b0690f5c4c59f13' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 12baed1c6..c1ed81cf3 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 110725 2011-02-21 20:11:19Z tpowa $ +# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=1 pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') @@ -13,13 +13,14 @@ backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) +options=(!strip) build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \ - --audio-card-list=ac97,sb16,es1370,adlib \ + --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs \ --kerneldir="/usr/src/linux-$(uname -r)" make @@ -30,6 +31,14 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/65-kvm.rules \ ${pkgdir}/lib/udev/rules.d/65-kvm.rules + # strip scripts directory + find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-executable*) # Binaries + /usr/bin/strip $STRIP_BINARIES "$binary";; + esac + done + } -md5sums=('f9d145d5c09de9f0984ffe9bd1229970' +md5sums=('b6c713a8db638e173af53a62d5178640' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 03f967d13..60dcbc981 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 115693 2011-03-19 13:02:20Z ibiru $ +# $Id: PKGBUILD 124188 2011-05-17 15:28:51Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.22 -pkgrel=3 +pkgver=2.30 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('intltool' 'curl' 'libnotify' 'desktop-file-utils' 'qt' 'libevent' 'libcanberra' 'dbus-glib') +makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'desktop-file-utils' 'qt' 'libevent' 'libcanberra' 'dbus-glib') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 transmissiond transmissiond.conf) -md5sums=('6499986bf769276310b00bda1090090d' - '50b7c17300bc8b38f44fb6f681ba05d0' +md5sums=('d812539eb6e8547614ab7d0d5c6496a8' + '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') - build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -63,6 +62,7 @@ package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" depends=('curl' 'qt' 'libevent') optdepends=('transmission-cli: daemon and web support') + install=transmission-qt.install cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/transmission/transmission-qt.install b/extra/transmission/transmission-qt.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/transmission/transmission-qt.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond index ff83bd331..1b4b4dc0e 100644 --- a/extra/transmission/transmissiond +++ b/extra/transmission/transmissiond @@ -31,7 +31,16 @@ case "$1" in while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done $0 start ;; + reload) + stat_busy "Reloading config" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|reload}" esac exit 0 diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index fb26f8a91..67055a5d1 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,32 +1,29 @@ -# $Id: PKGBUILD 109572 2011-02-10 20:32:59Z bisson $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 124164 2011-05-17 08:27:15Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.6.1 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc='Multilingual input method library' arch=('i686' 'x86_64') url='http://code.google.com/p/uim/' -license=('custom') +license=('custom:BSD') depends=('gtk2' 'libxft' 'libedit' 'anthy' 'm17n-lib') makedepends=('intltool' 'gettext' 'gnome-panel') optdepends=('gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" - 'home.patch') -sha1sums=('412bb2df6041185084e2f64fb73357389bf992b5' - 'dbcf90f3ea246c5723d715e0935072baa9364cd2') +source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # UIM's Makefile needs to write in $HOME - patch -p0 < ../home.patch; export HOME="`pwd`" - - ./configure --prefix=/usr --libexecdir=/usr/lib/uim \ - --with-anthy-utf8 + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/uim \ + --with-anthy-utf8 make } diff --git a/extra/uim/install b/extra/uim/install index ffed34d01..a2d5e00e6 100644 --- a/extra/uim/install +++ b/extra/uim/install @@ -1,13 +1,13 @@ post_install() { - echo -n "updating gtk.immodules... " - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - echo "done." + echo -n "updating gtk.immodules... " + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + echo "done." } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 0d7c0b367..63a7c1545 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2011.04.1 +pkgver=2011.05.2 pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') @@ -13,19 +13,19 @@ url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('bash' 'grep' 'coreutils' 'udev' +depends=('bash' 'grep' 'coreutils' 'udev>=167' 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') install=initscripts.install -source=("http://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" +source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') -md5sums=('9c9cca84f5601700f3f1d0303aa1e058' +md5sums=('f807b43a4dd43a6cf562f10651577ad2' '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} - DESTDIR=${pkgdir} ./install.sh + make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD new file mode 100644 index 000000000..dfdc56f09 --- /dev/null +++ b/libre/pacman/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=pacman +pkgver=3.5.2 +pkgrel=1.1 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') +optdepends=('fakeroot: for makepkg usage as normal user' + 'curl: for rankmirrors usage') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool) +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz + pacman.conf + pacman.conf.x86_64 + makepkg.conf) +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' + 'c7e6dbee04b7c492febea4366519b91d' + '8809642ed398d2b9b98c5974b8b5e348' + 'a8684989d3dfad5a6e1bcf95af3e571b') + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install Arch specific stuff + mkdir -p $pkgdir/etc + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686 " + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + mycarch="x86_64" + mychost="x86_64-unknown-linux-gnu" + myflags="-march=x86-64 " + ;; + esac + install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file + sed -i $pkgdir/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + + # install completion files + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman + mkdir -p $pkgdir/usr/share/zsh/site-functions/ + install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} + +# vim: set ts=2 sw=2 et: diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf new file mode 100644 index 000000000..a655e935f --- /dev/null +++ b/libre/pacman/makepkg.conf @@ -0,0 +1,114 @@ +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'rsync::/usr/bin/rsync -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/curl + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="@CARCH@" +CHOST="@CHOST@" + +#-- Exclusive: will only run on @CARCH@ +# -march (or -mcpu) builds exclusively for an architecture +# -mtune optimizes for an architecture, but builds for whole processor family +CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) +# A negated environment option will do the opposite of the comments below. +# +#-- fakeroot: Allow building packages as a non-root user +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +# +BUILDENV=(fakeroot !distcc color !ccache check) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +# +OPTIONS=(strip docs libtool emptydirs zipman purge) + +#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe <john@doe.com>" + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf new file mode 100644 index 000000000..675956d3d --- /dev/null +++ b/libre/pacman/pacman.conf @@ -0,0 +1,86 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64 new file mode 100644 index 000000000..ed460dd8b --- /dev/null +++ b/libre/pacman/pacman.conf.x86_64 @@ -0,0 +1,95 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install new file mode 100644 index 000000000..0e598bb4b --- /dev/null +++ b/libre/pacman/pacman.install @@ -0,0 +1,62 @@ +#!/bin/sh +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" +} + +_resetbackups() { + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" + + # path variables + pacconf="/etc/pacman.conf" + dbpath="/var/lib/pacman/local" + + # get a list of NoUpgrade files from the user's pacman.conf + echo ">>> Retrieving pacman.conf NoUpgrade list..." + config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) + # add the standard list of files, even if they are already above + config="$config \ + etc/passwd etc/group etc/shadow etc/sudoers \ + etc/fstab etc/raidtab etc/ld.so.conf \ + etc/rc.conf etc/rc.local \ + etc/modprobe.conf etc/modules.conf \ + etc/lilo.conf boot/grub/menu.lst" + + # blank md5sum for use in sed expression + zeroes='00000000000000000000000000000000' + + for file in $config; do + echo ">>> -> finding owner of /$file..." + line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) + # if file is owned by a package, go find its incorrectly stored sum + if [ ! -z "$line" ]; then + # get the name and version of the package owning file + name=$(echo $line | awk '{print $5}') + version=$(echo $line | awk '{print $6}') + # set the path to the backup array holding the md5sum + path="$dbpath/$name-$version/files" + # run a sed on the path to reset the line containing $file + # NOTE: literal tab characters in sed expression after $file + echo ">>> -> resetting sum of /$file..." + sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path + else + echo ">>> -> $file is unowned." + fi + done +} diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD new file mode 100644 index 000000000..09e0f4b3e --- /dev/null +++ b/libre/pacman/rePKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +CARCH=x86_64 +pkgname=pacman +pkgver=3.5.2 +pkgrel=1.1 +_pkgrel=1 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') +optdepends=('fakeroot: for makepkg usage as normal user' + 'curl: for rankmirrors usage') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool !strip) +source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + pacman.conf + pacman.conf.x86_64 + makepkg.conf) + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd "${srcdir}/" + rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + +} + +package() { + cp -a ./* ${pkgdir} + rm $pkgdir/etc/pacman.conf + + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + ;; + esac +} + +# vim: set ts=2 sw=2 et: diff --git a/multilib-testing/lib32-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD new file mode 100644 index 000000000..ff7f4f050 --- /dev/null +++ b/multilib-testing/lib32-llvm/PKGBUILD @@ -0,0 +1,153 @@ +# $Id: PKGBUILD 47129 2011-05-17 14:00:02Z lcarlier $ +# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sebastian Nowicki <sebnow@gmail.com> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> +# Contributor: Roberto Alsina <ralsina@kde.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=('lib32-llvm') +pkgver=2.9 +_gcc_ver=4.6.0 +pkgrel=1 +arch=('x86_64') +url="http://llvm.org/" +license=('custom:University of Illinois/NCSA Open Source License') +makedepends=('gcc-libs-multilib' 'lib32-libffi' 'python2' "gcc-multilib=$_gcc_ver") +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz + http://llvm.org/releases/$pkgver/clang-$pkgver.tgz + ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz + clang-plugin-loader-registry.patch + cindexer-clang-path.patch + clang-toolchains-gcc-versions.patch + clang-pure64.patch + enable-lto.patch) +md5sums=('793138412d2af2c7c7f54615f8943771' + '634de18d04b7a4ded19ec4c17d23cfca' + '70e23a3dc2b38ecb2bb4d2c48f47295d' + '02c23b4aaca3445b8bf39fddb2f9906e' + '87a7162dbe99e9ffce6c40bd09f5f4f0' + '8da236120a9a287a977b575b8b905c93' + '225ee6b531f8327f34f344a18cb4ec81' + '8f7582d7440e4a8342c3aea9ec714fb4') + +build() { + cd "$srcdir/llvm-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # Fix symbolic links from OCaml bindings to LLVM libraries + sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml + + # Fix installation directories, ./configure doesn't seem to set them right + sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ + -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ + -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + Makefile.config.in + + # Fix insecure rpath (http://bugs.archlinux.org/task/14017) + sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules + + # Get the correct list of symbols to export + # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html + patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" + + # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) + #patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" + + # Add GCC 4.6.0 to GccVersions (FS#23631) + #patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" + + # Adjust lib paths + #patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" + + # Make -flto work + # Use gold instead of default linker, and always use the plugin + #patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + + # Apply strip option to configure + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" + + # Include location of libffi headers in CPPFLAGS + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + + # TODO: Uncomment when clang works with GCC 4.6+ + #_cxx_headers="/usr/include/c++/$_gcc_ver" + #if [[ ! -d $_cxx_headers ]]; then + # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" + # return 1 + #fi + _cxx_headers="/usr/include/c++/clang-$pkgver" + + _32bit_headers="" + if [[ $CARCH == x86_64 ]]; then + # Important for multilib + _32bit_headers="32" + fi + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib32/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-root=$_cxx_headers \ + --with-cxx-include-arch=$CHOST \ + --with-cxx-include-32bit-dir=$_32bit_headers \ + --$_optimized_switch-optimized + + make REQUIRES_RTTI=1 +} + +package() { + pkgdesc="Low Level Virtual Machine (32 bits version)" + depends=('perl' 'lib32-libffi' 'llvm') + + cd "$srcdir/llvm-$pkgver" + + # We move the clang directory out of the tree so it won't get installed and + # then we bring it back in for the clang package + # mv tools/clang "$srcdir" + # -j1 is due to race conditions during the installation of the OCaml bindings + make -j1 DESTDIR="$pkgdir" install + # mv "$srcdir/clang" tools + + # OCaml bindings go to a separate package + # rm -rf "$srcdir"/{ocaml,ocamldoc} + # mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" + + # Remove duplicate files installed by the OCaml bindings + # rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} + + # 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\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" + sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config" + mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config" + # Get rid of example Hello transformation + rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* + + # Symlink the gold plugin where clang expects it + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so" + + # Add ld.so.conf.d entry + install -d "$pkgdir/etc/ld.so.conf.d" + echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} +} diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch new file mode 100644 index 000000000..ddaab690e --- /dev/null +++ b/multilib-testing/lib32-llvm/cindexer-clang-path.patch @@ -0,0 +1,10 @@ +--- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 ++++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 +@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP + + // We now have the CIndex directory, locate clang relative to it. + LibClangPath.eraseComponent(); ++ LibClangPath.eraseComponent(); + #endif + + LibClangPath.appendComponent("clang"); diff --git a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch new file mode 100644 index 000000000..f46eb9fce --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch @@ -0,0 +1,11 @@ +diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map +--- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 ++++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 +@@ -2,6 +2,7 @@ + global: main; + __progname; + environ; ++ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; + + local: *; + }; diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3306,7 +3306,7 @@ + else if (ToolChain.getArch() == llvm::Triple::arm) + CmdArgs.push_back("/lib/ld-linux.so.3"); + else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1317,18 +1317,10 @@ + if (Arch == llvm::Triple::x86) + Suffix64 = "/64"; + +- std::string Lib32 = "lib"; +- +- bool Exists; +- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) +- Lib32 = "lib32"; +- ++ std::string Lib32 = "lib32"; + std::string Lib64 = "lib"; +- bool Symlink; +- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && +- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) +- Lib64 = "lib64"; + ++ bool Exists; + std::string GccTriple = ""; + if (Arch == llvm::Triple::arm) { + if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch b/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch new file mode 100644 index 000000000..2e527300d --- /dev/null +++ b/multilib-testing/lib32-llvm/clang-toolchains-gcc-versions.patch @@ -0,0 +1,12 @@ +diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp +--- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 ++++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 +@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const + GccTriple = "i586-suse-linux"; + } + +- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", ++ const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", + "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", + "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", + "4.2"}; diff --git a/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch new file mode 100644 index 000000000..40d93104a --- /dev/null +++ b/multilib-testing/lib32-llvm/enable-lto.patch @@ -0,0 +1,36 @@ +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1398,11 +1398,11 @@ + Lib = Lib64; + } + +- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); ++ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); + if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) + Linker = LinkerPath.str(); + else +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + LinuxDistro Distro = DetectLinuxDistro(Arch); + +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3412,11 +3412,11 @@ + } + } + +- if (Args.hasArg(options::OPT_use_gold_plugin)) { ++ // if (Args.hasArg(options::OPT_use_gold_plugin)) { + CmdArgs.push_back("-plugin"); + std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); +- } ++ // } + + C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); + } diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 5bc9b7c23..da624adfc 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45021 2011-04-14 09:13:42Z lcarlier $ +# $Id: PKGBUILD 47149 2011-05-17 17:48:52Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,7 +10,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110412 + pkgver=7.10.99.git20110429 else pkgver=7.10.2 fi @@ -18,13 +18,13 @@ fi pkgrel=1 arch=(x86_64) makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' -'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') +'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm') url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05751aa2af1a8ec83c2d110385aab1b7e735238 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-f05751aa2af1a8ec83c2d110385aab1b7e735238.tar.bz2') - md5sums=('56d8862d1155f7e8054f9aa7f93ebebc') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0 + source=('ftp://ftp.archlinux.org/other/mesa/mesa-608a4a17feea9fba2812d4e5c01dd6dbadc5d6e0.tar.bz2') + md5sums=('8d1a895110a6d3b7c51b3521f794bae2') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') @@ -37,6 +37,10 @@ build() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + # for our llvm-config for 32 bit :( + export PATH="/usr/lib32/llvm:$PATH" + # fix linking with llvmpipe driver + sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile autoreconf -vfi else cd "${srcdir}/Mesa-${pkgver}" @@ -49,21 +53,26 @@ build() { if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ + --enable-gallium-r300 \ --enable-gallium-r600 \ --enable-gallium-nouveau \ + --enable-gallium-llvm \ + --enable-gallium-egl \ --enable-gallium-swrast \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx \ + --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-egl \ --enable-32-bit \ --libdir=/usr/lib32 + # --enable-gallium-svga \ + # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg + # The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply. + # --enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ @@ -141,6 +150,7 @@ package_lib32-libegl() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install else cd "${srcdir}/Mesa-${pkgver}" fi diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD index d561a25da..78be6ccc6 100644 --- a/multilib/binutils-multilib/PKGBUILD +++ b/multilib/binutils-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46021 2011-05-02 00:26:22Z heftig $ +# $Id: PKGBUILD 46786 2011-05-11 15:43:26Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=binutils-multilib pkgver=2.21 -pkgrel=7 +pkgrel=8 _date=20110430 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64') @@ -19,10 +19,16 @@ depends=('glibc>=2.13' 'zlib') makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec') +source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2 + binutils-2.21-strip-segfault.patch) +md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec' + '98e8dfaf1c0ededa586823ebfb27825a') build() { + cd ${srcdir}/binutils + # http://sourceware.org/bugzilla/show_bug.cgi?id=12632 + patch -Np1 -i $srcdir/binutils-2.21-strip-segfault.patch + cd ${srcdir} mkdir binutils-build && cd binutils-build diff --git a/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch new file mode 100644 index 000000000..0133d879b --- /dev/null +++ b/multilib/binutils-multilib/binutils-2.21-strip-segfault.patch @@ -0,0 +1,96 @@ +diff --git a/binutils/objcopy.c b/binutils/objcopy.c +index 15c4f95..b64f3d0 100644 +--- a/binutils/objcopy.c ++++ b/binutils/objcopy.c +@@ -1,6 +1,6 @@ + /* objcopy.c -- copy object file from input to output, optionally massaging it. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++ 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + Free Software Foundation, Inc. + + This file is part of GNU Binutils. +@@ -2024,6 +2024,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + struct stat buf; + int stat_status = 0; + bfd_boolean del = TRUE; ++ bfd_boolean ok_object; + + /* Create an output file for this member. */ + output_name = concat (dir, "/", +@@ -2061,44 +2062,42 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target, + l->obfd = NULL; + list = l; + +- if (bfd_check_format (this_element, bfd_object)) ++ ok_object = bfd_check_format (this_element, bfd_object); ++ if (!ok_object) ++ bfd_nonfatal_message (NULL, this_element, NULL, ++ _("Unable to recognise the format of file")); ++ ++ /* PR binutils/3110: Cope with archives ++ containing multiple target types. */ ++ if (force_output_target || !ok_object) ++ output_bfd = bfd_openw (output_name, output_target); ++ else ++ output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ ++ if (output_bfd == NULL) + { +- /* PR binutils/3110: Cope with archives +- containing multiple target types. */ +- if (force_output_target) +- output_bfd = bfd_openw (output_name, output_target); +- else +- output_bfd = bfd_openw (output_name, bfd_get_target (this_element)); ++ bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ status = 1; ++ return; ++ } ++ ++ if (ok_object) ++ { ++ del = !copy_object (this_element, output_bfd, input_arch); + +- if (output_bfd == NULL) ++ if (del && bfd_get_arch (this_element) == bfd_arch_unknown) ++ /* Try again as an unknown object file. */ ++ ok_object = FALSE; ++ else if (!bfd_close (output_bfd)) + { + bfd_nonfatal_message (output_name, NULL, NULL, NULL); ++ /* Error in new object file. Don't change archive. */ + status = 1; +- return; + } +- +- del = ! copy_object (this_element, output_bfd, input_arch); +- +- if (! del +- || bfd_get_arch (this_element) != bfd_arch_unknown) +- { +- if (!bfd_close (output_bfd)) +- { +- bfd_nonfatal_message (output_name, NULL, NULL, NULL); +- /* Error in new object file. Don't change archive. */ +- status = 1; +- } +- } +- else +- goto copy_unknown_element; + } +- else +- { +- bfd_nonfatal_message (NULL, this_element, NULL, +- _("Unable to recognise the format of file")); + +- output_bfd = bfd_openw (output_name, output_target); +-copy_unknown_element: ++ if (!ok_object) ++ { + del = !copy_unknown_object (this_element, output_bfd); + if (!bfd_close_all_done (output_bfd)) + { +-- +1.6.5.GIT + diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 4a5a69628..98dcef2a4 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46019 2011-05-02 00:10:26Z heftig $ +# $Id: PKGBUILD 47043 2011-05-14 11:08:03Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,8 +8,8 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.6.0 -pkgrel=4 -_snapshot=4.6-20110429 +pkgrel=5 +_snapshot=4.6-20110513 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') @@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran, ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('fa586a5634ae3b462c5fb2d55160b14f' - '2591b1fad977f7bd6136c9ac1298ef04' - '366f93c1867f35c8860b42965efde955' - '21779792ef7e0ed7abef611160b0099c' - 'cf518c56b968925a2eca3aa2b4cdbd7b' - 'f66ef8597b99961eda7573df505ea354' - '3d89dd233ceb6a837d14ee6b940a43ed' +md5sums=('2be769db16ac02f30fb62423b4c50145' + 'a310d230945f4b3093dd3ca72839c649' + '361a10c5a5545c80fd271b18036dd00c' + 'f7db2f6ed34398361de62cb6b8eb53d2' + '9b69c1d8874e8496c1965ee3e32eaa6d' + '248e53b461078bf1c89528fb8e4ba051' + 'e15a01b0d02ff12e975e4c2649e71e55' '1e9fd2eaf0ee47ea64e82c48998f1999' '22cec272f9cc2801d3cd348feaca888b' '4df25b623799b148a0703eaeec8fdf3f') diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD index c037f2d98..b81bee1e0 100644 --- a/multilib/nspluginwrapper/PKGBUILD +++ b/multilib/nspluginwrapper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 47097 2011-05-16 17:45:22Z bluewind $ +# $Id: PKGBUILD 47136 2011-05-17 17:28:43Z bluewind $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=nspluginwrapper pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform NPAPI compatible plugin viewer" arch=('x86_64') url="http://nspluginwrapper.davidben.net/" @@ -28,8 +28,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir/" install - mkdir -p "$pkgdir"/usr/lib/mozilla/plugins/ - ln -s /usr/lib/nspluginwrapper/x86_64/linux/npwrapper.so "$pkgdir"/usr/lib/mozilla/plugins/ } # vim:set ts=2 sw=2 et: diff --git a/testing/acpid/PKGBUILD b/testing/acpid/PKGBUILD index a8bfa9018..28d94a296 100644 --- a/testing/acpid/PKGBUILD +++ b/testing/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123979 2011-05-15 11:10:08Z andrea $ +# $Id: PKGBUILD 124204 2011-05-17 17:28:41Z andrea $ # Maintainer: # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.9 -pkgrel=2 +pkgrel=3 pkgdesc="A daemon for delivering ACPI power management events with netlink support" arch=('i686' 'x86_64') url="http://tedfelix.com/linux/acpid-netlink.html" @@ -17,6 +17,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" 'anything' 'handler.sh' 'acpid.conf.d') +replaces=('acpid2') backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') build() { diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD index d59222745..9f2ddcd51 100644 --- a/testing/archboot/PKGBUILD +++ b/testing/archboot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124008 2011-05-15 21:19:33Z tpowa $ +# $Id: PKGBUILD 124155 2011-05-17 06:46:14Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=archboot pkgver=2011.05 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced, modular arch boot/install image creation utility" arch=(i686 x86_64) license=('GPL') @@ -45,5 +45,5 @@ build() gcc -o vmware-detect vmware-detect.c install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('5ea2090ddc56a6b4716961f53584328a' +md5sums=('e6d26e24c7491a3203421bd14e570c04' '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/testing/vigra/PKGBUILD b/testing/vigra/PKGBUILD new file mode 100644 index 000000000..400bd5898 --- /dev/null +++ b/testing/vigra/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 124225 2011-05-17 18:01:10Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=vigra +pkgver=1.7.1 +pkgrel=1 +pkgdesc="Computer vision library" +arch=('i686' 'x86_64') +url="http://hci.iwr.uni-heidelberg.de/vigra/" +license=('custom:MIT') +depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw') +makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') +optdepends=('python2: for python bindings' + 'boost-libs: for python bindings') +options=('!libtool') +source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz + vigra-1.7.1.gcc460.patch) +md5sums=('2bde208e0fd7626770169dd4fa097282' + '25ef8bc26bc38ee67e5b512d2acd0166') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_VIGRANUMPY=1 \ + -DDOCINSTALL=share/doc + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + # license + install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/vigra/vigra-1.7.1.gcc460.patch b/testing/vigra/vigra-1.7.1.gcc460.patch new file mode 100644 index 000000000..46f194dbc --- /dev/null +++ b/testing/vigra/vigra-1.7.1.gcc460.patch @@ -0,0 +1,33 @@ +diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx +--- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 +@@ -43,6 +43,7 @@ + #include <set> + #include <list> + #include <numeric> ++#include <stddef.h> + #include "mathutil.hxx" + #include "array_vector.hxx" + #include "sized_int.hxx" +diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx +--- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -57,6 +57,7 @@ + #include <fstream> + #include <cstring> + #include <vector> ++#include <stddef.h> + #include "vigra/multi_array.hxx" + + namespace vigra { +diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx +--- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 ++++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + |