diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/abs-libre/PKGBUILD | 45 | ||||
-rw-r--r-- | libre/audio-convert-libre/PKGBUILD | 11 | ||||
-rw-r--r-- | libre/bogofilter-libre/PKGBUILD | 24 | ||||
-rw-r--r-- | libre/bumblebee-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/calibre-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/ecasound-libre/PKGBUILD | 19 | ||||
-rw-r--r-- | libre/ecasound-libre/ruby2.patch | 12 | ||||
-rw-r--r-- | libre/grub/60_memtest86+ | 2 | ||||
-rw-r--r-- | libre/grub/PKGBUILD | 4 |
9 files changed, 72 insertions, 55 deletions
diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD index 1abcd02dc..259cf007f 100644 --- a/libre/abs-libre/PKGBUILD +++ b/libre/abs-libre/PKGBUILD @@ -1,48 +1,51 @@ -# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $ +# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> _pkgname=abs pkgname=abs-libre #CARCH=mips64el -pkgver=2.4.3 -pkgrel=3 +pkgver=2.4.4 +pkgrel=1 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/abs.git/" license=('GPL') depends=('bash' 'rsync') backup=(etc/abs.conf) -source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz) -md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd') +source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' + 'a628f7d5b1cd1e838366b88709690c24') provides=("${_pkgname}=${pkgver}") replaces=("${_pkgname}") conflicts=("${_pkgname}") build() { - cd ${srcdir}/${_pkgname} + cd "$_pkgname-$pkgver" - make prefix=/usr sysconfdir=/etc prepare - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "$_pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install # Add readme file, and make base /var/abs path - install -dm0755 ${pkgdir}/var/abs/local/ - install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README + install -dm755 "${pkgdir}"/var/abs/local/ + install -Dm644 README "${pkgdir}"/var/abs/README sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf # make adjustments to abs.conf - case $CARCH in - "i686") - sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf - ;; - "x86_64") - sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf - ;; - "mips64el") + if [[ $CARCH = "i686" ]]; then + sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf + fi + if [[ $CARCH = "x86_64" ]]; then + sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf + fi + if [[ $CARCH = "mips64el" ]]; then sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf - ;; - esac + fi } - diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD index 07dc6e87c..81db4af67 100644 --- a/libre/audio-convert-libre/PKGBUILD +++ b/libre/audio-convert-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Igor Galic <i.galic@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,8 +6,8 @@ _pkgname=audio-convert pkgname=audio-convert-libre pkgver=0.3.1.1 -pkgrel=6 -pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma (without nonfree faac recommendation)" +pkgrel=7 +pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma, without nonfree faac recommendation" arch=('any') url="http://freshmeat.net/projects/audio-convert" license=('GPL') @@ -23,8 +23,11 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2) -md5sums=('0c6b61bc96be4c9879f85b000192f3fd') +sha256sums=('7b37d5fc2a4dd62885910b6424f5ff6870c329ed4f4f51feeeb952152c7d9d2b') package() { install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname" + +#FS#29260 fix + sed -i '46 s/^/#/' "$pkgdir/usr/bin/$_pkgname" } diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD index c5718a9fd..42a33a113 100644 --- a/libre/bogofilter-libre/PKGBUILD +++ b/libre/bogofilter-libre/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $ +# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Low Kian Seong <fastmail_low@speedymail.org> _pkgname=bogofilter pkgname=bogofilter-libre -pkgver=1.2.2 -pkgrel=5 -pkgdesc="A fast Bayesian spam filtering tool" +pkgver=1.2.3 +pkgrel=1 +pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files" arch=('i686' 'x86_64') license=('GPL3') url="http://bogofilter.sourceforge.net" depends=('db' 'perl' 'gsl') backup=('etc/bogofilter/bogofilter.cf') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz) -md5sums=('af9c7857c66b1884c820f54f23082701') +source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2) +md5sums=('c3ed7f483b83abcbf6d8c797084bd06e') provides=("${_pkgname}=${pkgver}") replaces=("${_pkgname}") conflicts=("${_pkgname}") -mksource() { - [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2 - tar xf ${_pkgname}-${pkgver}.tar.bz2 - # Remove noncommercial files. - rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01} - tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver} -} - build() { cd "${srcdir}/${_pkgname}-${pkgver}" + + # Remove noncommercial files. + rm doc/bogofilter-SA-{2005-0{1,2},2010-01} + ./configure --prefix=/usr \ --sysconfdir=/etc/bogofilter \ --localstatedir=/var \ diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index a7b9ad140..3f43d26c9 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=bumblebee pkgname=bumblebee-libre pkgver=3.2.1 -pkgrel=1 +pkgrel=3 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support" arch=('i686' 'x86_64') depends=('virtualgl' 'glib2' 'mesa-libgl') @@ -47,6 +47,7 @@ build() { ./configure \ CONF_DRIVER=nouveau \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --without-pidfile @@ -60,6 +61,7 @@ package() { # Install systemd unit install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" + sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" # Make bash_completion work mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun" diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 8a42d10c3..2057bf70b 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92801 2013-06-15 11:25:47Z jelle $ +# $Id: PKGBUILD 92904 2013-06-18 12:33:10Z andrea $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -10,7 +10,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=0.9.35 -pkgrel=1.1 +pkgrel=2 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -19,7 +19,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 'python2-imaging' 'shared-mime-info' 'python2-dnspython' - 'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' + 'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 'python2-netifaces' 'python2-cssselect') makedepends=('python2-pycountry' 'qt4-private-headers') optdepends=('ipython2: to use calibre-debug') diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index 30cbbc641..6fbdd3fb3 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -7,13 +7,12 @@ _pkgname=ecasound pkgname=ecasound-libre pkgver=2.9.0 -pkgrel=2.1 -pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)" +pkgrel=3 +pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation" arch=('i686' 'x86_64') url="http://www.eca.cx/ecasound/" license=('GPL' 'LGPL') -depends=('audiofile' 'liblo' - 'liboil' 'lilv') +depends=('audiofile' 'liblo' 'liboil' 'lilv') makedepends=('python2' 'ruby') optdepends=('python2: ecamonitor, ECI API' 'ruby: ECI API' @@ -27,14 +26,16 @@ replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver options=('!libtool') -source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz) -md5sums=('05e7d4664cdf4c7a138c098e9506a551') +source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz" + 'ruby2.patch') +md5sums=('05e7d4664cdf4c7a138c098e9506a551' + '6909dbd4f67f76d3bd31ce7c7fe16212') build() { cd "$srcdir/$_pkgname-$pkgver" - # use vendor_ruby for ruby files - sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure + # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files + patch -Np1 -i "$srcdir/ruby2.patch" PYTHONPATH=/usr/bin/python2 ./configure \ --prefix=/usr \ diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch new file mode 100644 index 000000000..d55f12140 --- /dev/null +++ b/libre/ecasound-libre/ruby2.patch @@ -0,0 +1,12 @@ +diff -aur ecasound-2.9.0.orig/configure ecasound-2.9.0/configure +--- ecasound-2.9.0.orig/configure 2013-03-26 17:14:51.759045636 +0800 ++++ ecasound-2.9.0/configure 2013-03-26 17:15:50.502060731 +0800 +@@ -6535,7 +6535,7 @@ + rubyecasound_support=no + ECA_S_RUBY_SITEDIR="" + else +- ECA_S_RUBY_SITEDIR="`ruby -e 'require "rbconfig"; include Config; print CONFIG["sitedir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" ++ ECA_S_RUBY_SITEDIR="`ruby -e 'include RbConfig; print CONFIG["vendordir"] + "/" + CONFIG["MAJOR"] + "." + CONFIG["MINOR"]'`" + fi + + diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+ index 064922ef2..086f0cc84 100644 --- a/libre/grub/60_memtest86+ +++ b/libre/grub/60_memtest86+ @@ -22,7 +22,7 @@ if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})" _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})" cat << EOF -if [ "${grub_platform}" == "pc" ]; then +if [ "\${grub_platform}" == "pc" ]; then menuentry "Memory Tester (memtest86+)" ${CLASS} { search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID} linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86} diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 50a8eda05..522c1517d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,7 +9,7 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=4 +pkgrel=5 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -34,7 +34,7 @@ md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' 'c776aaf2cc35488a7c531b59e697470d' '52d374e0194e3f2e39ff7c92ecd58a6c' '255eafb440b8c285b20431366c2d2d27' - 'ae9f1bc1a579ddc88b9b2e8b46f7e1d5' + 'be55eabc102f2c60b38ed35c203686d6' 'f343ed2340ebc86c427873641bb72419' 'ab751d1d8cd3fd47e5ee24d71ecc31ed' '342dd18472a24e5fd252458b24f39a29') |