diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-29 01:05:02 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-29 01:05:02 -0700 |
| commit | 38b1ce25596ae456fefb3214a73c3d1005da568f (patch) | |
| tree | 5cb69842c94bdd2b34b01be22f97b5949237550f | |
| parent | 1a32448c2c53b0e66ce0fe14c5dd2057afd432bc (diff) | |
Tue Oct 29 01:04:23 PDT 2013
67 files changed, 685 insertions, 604 deletions
diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD index 29aa2e938..ef7dd7bb4 100644 --- a/community/argyllcms/PKGBUILD +++ b/community/argyllcms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96037 2013-08-19 11:21:51Z tredaelli $ +# $Id: PKGBUILD 99402 2013-10-28 11:10:04Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com) pkgname=argyllcms _pkgname=Argyll -pkgver=1.6.0 +pkgver=1.6.1 _pkgver="V${pkgver}" pkgrel=1 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware" @@ -15,7 +15,7 @@ source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip) url="http://www.argyllcms.com/" license=("GPL" "AGPL") install=${pkgname}.install -md5sums=('0e89e62fd4bb49dcc6ce57d54592216e') +md5sums=('aed439b76054ef8e8b065106d314681c') build() { cd "${srcdir}"/${_pkgname}_${_pkgver} diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD index e74300516..7f284495f 100644 --- a/community/arpack/PKGBUILD +++ b/community/arpack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85849 2013-03-07 18:31:38Z arodseth $ +# $Id: PKGBUILD 99415 2013-10-28 12:15:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=arpack pkgver=3.1.2 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686') pkgdesc='Fortran77 subroutines designed to solve large scale eigenvalue problems' url='http://forge.scilab.org/index.php/p/arpack-ng/' @@ -17,7 +17,7 @@ source=("http://forge.scilab.org/upload/$pkgname-ng/files/$pkgname-ng_$pkgver.ta sha256sums=('9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2') build() { - cd "$srcdir/$pkgname-ng_$pkgver" + cd "$pkgname-ng_$pkgver" ./configure --prefix=/usr --enable-mpi make \ @@ -27,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-ng_$pkgver" + cd "$pkgname-ng_$pkgver" make DESTDIR="$pkgdir/" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD index 0d3417363..03b4bef47 100644 --- a/community/cinnamon-settings-daemon/PKGBUILD +++ b/community/cinnamon-settings-daemon/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=cinnamon-settings-daemon -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.5 +pkgrel=1 pkgdesc="The Cinnamon Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -16,9 +16,9 @@ url="https://github.com/linuxmint/cinnamon-settings-daemon" source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz" keyboard.patch automount-plugin.patch) -sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168' +sha256sums=('12dc50677fb90be00ed7e947f40eee4aa9d5126d7ad026d2a8d87588ef312018' '3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c' - '0a6dfbea6f28e5107212a8e8091ded6a3b5b34b1710c11c2f04c4d02846f9398') + 'ff30a46acc968b2cfab7f6040aa2ee400049f784b466901c347c513da2a538a9') prepare() { cd $pkgname-$pkgver diff --git a/community/cinnamon-settings-daemon/automount-plugin.patch b/community/cinnamon-settings-daemon/automount-plugin.patch index f6ca1181f..17eebca7f 100644 --- a/community/cinnamon-settings-daemon/automount-plugin.patch +++ b/community/cinnamon-settings-daemon/automount-plugin.patch @@ -382,7 +382,7 @@ diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cin - $(top_builddir)/cinnamon-settings-daemon/libcsd.la + $(NULL) --autostartdir = $(sysconfdir)/xdg/autostart +-autostartdir = $(datadir)/applications -autostart_in_files = cinnamon-fallback-mount-helper.desktop.in -autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in -autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 7e7c9b1fe..716c5b779 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99288 2013-10-26 17:30:16Z faidoc $ +# $Id: PKGBUILD 99378 2013-10-28 04:36:13Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=2.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -15,13 +15,10 @@ depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-sessio 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme' 'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring' 'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' - 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk') + 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk' + 'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd' + 'network-manager-applet' 'nemo') makedepends=('gnome-common' 'intltool') -optdepends=('cinnamon-control-center: extended configurations for Cinnamon' - 'cinnamon-screensaver: lock screen' - 'gucharmap: show character table from Keyboard applet' - 'libgnomekbd: show keyboard layout from Keyboard applet' - 'nemo: the official Cinnamon file manager (forked from Nautilus)') options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" @@ -69,6 +66,9 @@ prepare() { # Port to GStreamer 1.0. Also backports some recorder bugfixes patch -Np1 -i ../cinnamon-gstreamer1.patch + + # Remove cinnamon-fallback-mount-helper from required components + sed -i 's/cinnamon-fallback-mount-helper;//' files/usr/share/cinnamon-session/sessions/cinnamon*.session } build() { diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD index b8b5b2596..9d745438d 100644 --- a/community/dispcalgui/PKGBUILD +++ b/community/dispcalgui/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96076 2013-08-20 06:32:16Z lcarlier $ +# $Id: PKGBUILD 99412 2013-10-28 11:55:41Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Cedric Girard <girard.cedric@gmail.com> # Contributor: foxbunny <bg.branko@gmail.com> pkgname=dispcalgui -pkgver=1.2.7.0 -pkgrel=2 +pkgver=1.5.3.1 +pkgrel=1 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS" arch=('i686' 'x86_64') url="http://hoech.net/dispcalGUI/" @@ -15,7 +15,7 @@ depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'pytho optdepends=('gksu: For running as root') install=${pkgname}.install source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz") -md5sums=('a0ff80ee5e560fbe208c12189e00c470') +md5sums=('1b7542ecee8f39a49b90197613a46a73') prepare() { cd "${srcdir}"/dispcalGUI-${pkgver} diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index dbd808f40..570885d15 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92181 2013-06-02 13:25:12Z bpiotrowski $ +# $Id: PKGBUILD 99431 2013-10-28 19:00:44Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Jan Fader <jan.fader@web.de> pkgname=fish -pkgver=2.0.0 -pkgrel=2 +pkgver=2.1.0 +pkgrel=1 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64') url='http://fishshell.com/' @@ -15,21 +15,19 @@ license=('GPL2') depends=('python2' 'inetutils') makedepends=('doxygen' 'python') install=fish.install -source=(fish-$pkgver.tar.gz::http://fishshell.com/files/$pkgver/fish.tar.gz) -md5sums=('fe5907e6af61607d4128ce891a1f6501') +source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz) +md5sums=('3a29aebde522b8f52d9975d7423db99e') build() { - set -x - cd fish - autoconf + cd fish-$pkgver ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --without-xsel + --sysconfdir=/etc \ + --without-xsel make } package() { - cd fish + cd fish-$pkgver make DESTDIR="$pkgdir" install # use python2 diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 698be2810..c04af17c1 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 90316 2013-05-11 13:01:51Z arodseth $ +# $Id: PKGBUILD 99417 2013-10-28 12:23:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock pkgver=2.13.2 -pkgrel=1 +pkgrel=2 pkgdesc='Tool for generating documentation for Haskell libraries' url='http://hackage.haskell.org/package/haddock/' license=('custom:BSD3') arch=('x86_64' 'i686') makedepends=('alex' 'happy') -depends=('ghc=7.6.3-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths') +depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths') install="$pkgname.install" source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3') +options=('staticlibs') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \ @@ -30,7 +31,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" install -m744 unregister.sh \ diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index 81cb30885..4a85ba633 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99322 2013-10-26 21:11:19Z jelle $ +# $Id: PKGBUILD 99394 2013-10-28 10:42:23Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -6,37 +6,39 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=6 +pkgrel=7 pkgdesc='Replaces and enhances Text.Regex' url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +depends=('ghc' 'haskell-regex-base' 'haskell-regex-posix') +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +install="$pkgname.install" options=('staticlibs') sha256sums=('d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$_hkgname-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ + --docdir="/usr/share/doc/$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$_hkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index 18a6d6cf3..2ee285bcb 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99320 2013-10-26 21:07:39Z jelle $ +# $Id: PKGBUILD 99396 2013-10-28 10:47:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -6,21 +6,22 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=5 +pkgrel=6 pkgdesc='The posix regex backend for regex-base' -url="http://hackage.haskell.org/package/${_hkgname}" +url="http://hackage.haskell.org/package/$_hkgname" license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +arch=('x86_64' 'i686') +depends=('ghc' 'haskell-regex-base') +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +install="$pkgname.install" options=('staticlibs') sha256sums=('56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e') build() { - cd ${srcdir}/${_hkgname}-${pkgver} + cd "$_hkgname-$pkgver" + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + --docdir="/usr/share/doc/$pkgname" --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock runhaskell Setup register --gen-script @@ -29,14 +30,15 @@ build() { } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$_hkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 968bcb1cd..6f62a0f20 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89321 2013-04-28 16:52:43Z td123 $ +# $Id: PKGBUILD 99400 2013-10-28 10:58:26Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-tar pkgver=0.4.0.1 -pkgrel=5 +pkgrel=6 pkgdesc='Reading, writing and manipulating tar archive files' url='http://hackage.haskell.org/package/tar' license=('custom:BSD3') @@ -13,6 +13,7 @@ depends=('ghc=7.6.3-1') source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d') +options=('staticlibs') build() { cd "$srcdir/tar-$pkgver" diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index 67ee0ad24..8f85d691d 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ +# $Id: PKGBUILD 99398 2013-10-28 10:55:23Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> @@ -6,14 +6,15 @@ _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.1 -pkgrel=4 +pkgrel=5 pkgdesc='Combinators for producing XHTML 1.0' url='http://hackage.haskell.org/package/xhtml' license=('custom:BSD3') arch=('x86_64' 'i686') depends=('ghc=7.6.3-1' 'sh') source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") -install=$pkgname.install +install="$pkgname.install" +options=('staticlibs') sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') build() { diff --git a/community/libclastfm/PKGBUILD b/community/libclastfm/PKGBUILD index b566ae17a..cc0af7731 100644 --- a/community/libclastfm/PKGBUILD +++ b/community/libclastfm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 72448 2012-06-14 16:10:56Z ttopper $ +# $Id: PKGBUILD 99439 2013-10-28 21:06:50Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=libclastfm pkgver=0.5 -pkgrel=1 +pkgrel=2 pkgdesc="An unofficial C-API for the Last.fm web service" arch=("i686" "x86_64") url="http://liblastfm.sourceforge.net/" diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD index e0c031534..b820b6c11 100644 --- a/community/libdbi/PKGBUILD +++ b/community/libdbi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87114 2013-03-27 13:46:18Z ttoepper $ +# $Id: PKGBUILD 99441 2013-10-28 21:28:36Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Carl Flippin <carlf@photocarl.org> pkgname=libdbi pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A database independant abstraction layer for C" url="http://libdbi.sourceforge.net" license=('LGPL') diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index 98b7c0477..8febf7adf 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,30 +1,28 @@ -#$Id: PKGBUILD 96680 2013-09-03 01:45:50Z bgyorgy $ +#$Id: PKGBUILD 99433 2013-10-28 19:01:06Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=lxappearance -pkgver=0.5.2 -pkgrel=2 -pkgdesc="Feature-rich GTK+ theme switcher of the LXDE Desktop" +pkgver=0.5.3 +pkgrel=1 +pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop' arch=('i686' 'x86_64') license=('GPL2') -url="http://lxde.org/" +url='http://lxde.org/' groups=('lxde') depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('a088c6ef08fd25df7dc3be5b07168bbe') +md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5') build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --sysconfdir=/etc --prefix=/usr - make + cd $pkgname-$pkgver + ./configure --sysconfdir=/etc --prefix=/usr + make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/lxsplit/PKGBUILD b/community/lxsplit/PKGBUILD index 86d8a1a11..28326d8cc 100644 --- a/extra/lxsplit/PKGBUILD +++ b/community/lxsplit/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 137625 2011-09-10 08:31:27Z pierre $ +# $Id: PKGBUILD 99429 2013-10-28 18:50:40Z xyne $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Maintainer: Xyne <ac xunilhcra enyx, backwards> pkgname=lxsplit pkgver=0.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version" arch=('i686' 'x86_64') url="http://lxsplit.sourceforge.net/" license=('GPL') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz") -md5sums=('ed21a08c167c08d4d81c820782947cb1') +sha256sums=('858fa939803b2eba97ccc5ec57011c4f4b613ff299abbdc51e2f921016845056') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -d ${pkgdir}/usr/bin - make INSTALL_PATH=${pkgdir}/usr/bin install + cd "$srcdir/$pkgname-$pkgver" + install -d "$pkgdir/usr/bin" + make INSTALL_PATH="$pkgdir/usr/bin" install } diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD index 6b163f4c4..7f4858d6a 100644 --- a/community/miniupnpc/PKGBUILD +++ b/community/miniupnpc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92933 2013-06-19 14:29:17Z tredaelli $ +# $Id: PKGBUILD 99404 2013-10-28 11:22:46Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Florian Loitsch <archlinux@florian.loitsch.com> pkgname=miniupnpc pkgver=1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices" arch=('i686' 'x86_64') url="http://miniupnp.free.fr" diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD index 75e4bdfa8..66cf7c9a1 100644 --- a/community/mpv/PKGBUILD +++ b/community/mpv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 99197 2013-10-25 12:45:06Z giovanni $ +# $Id: PKGBUILD 99435 2013-10-28 20:04:56Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Eivind Uggedal <eivind@uggedal.com> pkgname=mpv pkgver=0.2.1 -pkgrel=2 +pkgrel=3 pkgdesc='Video player based on MPlayer/mplayer2' arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ depends=( 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' ) -makedepends=('mesa' 'python-docutils') +makedepends=('mesa' 'python-docutils' 'lua') options=(!emptydirs) install=mpv.install source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz") diff --git a/community/nmon/PKGBUILD b/community/nmon/PKGBUILD index 6420dedb8..8c938cf04 100644 --- a/community/nmon/PKGBUILD +++ b/community/nmon/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 67998 2012-03-16 23:55:43Z giovanni $ +# $Id: PKGBUILD 99425 2013-10-28 14:29:30Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=nmon -pkgver=14g -pkgrel=3 +pkgver=14i +pkgrel=1 pkgdesc="AIX & Linux Performance Monitoring tool" arch=('i686' 'x86_64') url="http://nmon.sourceforge.net" license=('GPL') depends=('ncurses') source=("http://downloads.sourceforge.net/${pkgname}/lmon$pkgver.c") -md5sums=('e537f51446fb375140368b115dc8278b') +sha256sums=('d401cb5048e3e8e8f1ad63e68a0499c73ec64d5d2b7c41a1aeb2b596374eaa86') build() { cd ${srcdir} - cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g + cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D X86 } package() { diff --git a/community/openjpeg2/PKGBUILD b/community/openjpeg2/PKGBUILD new file mode 100644 index 000000000..177a798b1 --- /dev/null +++ b/community/openjpeg2/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 99383 2013-10-28 09:50:41Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=openjpeg2 +pkgver=2.0.0 +pkgrel=1 +pkgdesc="An open source JPEG 2000 codec, version ${pkgver}" +arch=(i686 x86_64) +license=('BSD') +url="http://www.openjpeg.org" +makedepends=('cmake') +depends=('zlib') +options=('!libtool') +source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) +sha1sums=('0af78ab2283b43421458f80373422d8029a9f7a7') + +build() { + cd "${srcdir}/openjpeg-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr . + make +} + +package() { + cd "${srcdir}/openjpeg-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD index d63f21c05..0efb606e2 100644 --- a/community/osmo/PKGBUILD +++ b/community/osmo/PKGBUILD @@ -1,36 +1,38 @@ -# $Id: PKGBUILD 90853 2013-05-14 21:40:39Z andrea $ +# $Id: PKGBUILD 99427 2013-10-28 16:13:05Z jgc $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Benzo <mb_benzo@yahoo.es> pkgname=osmo -pkgver=0.2.10 -pkgrel=8 +pkgver=0.2.12 +pkgrel=1 pkgdesc="A handy personal organizer" +_svnver=937 arch=('i686' 'x86_64') url="http://clayo.org/osmo/" license=('GPL') -depends=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2') +depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2') makedepends=('pkgconfig' 'libtar') optdepends=('sox: to play sounds') -install=$pkgname.install -source=("http://downloads.sourceforge.net/osmo-pim/$pkgname-$pkgver.tar.gz" - 'osmo-0.2.10-libnotify-0.7.patch') -md5sums=('a774db748228efee96186158d553ade9' - '0b146a548f2d3208dc88e6501a8f3448') +install=osmo.install +source=(ftp://ftp.archlinux.org/other/community/osmo-${_svnver}.tar.xz + osmo-0.2.10-configure.patch) +md5sums=('ddcd0b23a24d8f1ec5abc904742233bf' + '122fc15441b6215081772a00aa532394') -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np0 -i "$srcdir/osmo-0.2.10-libnotify-0.7.patch" - - #libical 0.4.4 workaround - LIBICAL_CFLAGS='-I/usr/include/libical' ./configure --prefix=/usr +prepare() { + cd osmo-pim + patch -Np1 -i ../osmo-0.2.10-configure.patch + autoreconf -fi +} +build() { + cd osmo-pim + ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd osmo-pim make DESTDIR="$pkgdir" install } diff --git a/community/osmo/osmo-0.2.10-configure.patch b/community/osmo/osmo-0.2.10-configure.patch new file mode 100644 index 000000000..c5e7895b2 --- /dev/null +++ b/community/osmo/osmo-0.2.10-configure.patch @@ -0,0 +1,24 @@ +--- osmo-pim/configure.ac 2011-08-15 19:06:25.184165142 -0700 ++++ osmo-pim/configure.ac.new 2011-08-15 19:35:19.285312355 -0700 +@@ -4,7 +4,7 @@ + AC_PREREQ(2.61) + AC_INIT([Osmo], [0.2.12], [pasp@users.sf.net]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AM_INIT_AUTOMAKE([-Werror foreign]) + AC_CONFIG_SRCDIR([src/contacts.c]) + AC_CONFIG_HEADER([config.h]) + AC_MSG_CHECKING(for type of build) +@@ -245,9 +245,9 @@ + [configdir=$withval AC_SUBST([configdir])]) + AM_CONDITIONAL([CONFIGDIR], [test x$configdir != x]) + +-CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"} +-CXXFLAGS=${CXXFLAGS:="$CFLAGS"} +-CPPFLAGS="" ++CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS" ++CXXFLAGS="$CFLAGS $CXXFLAGS" ++CPPFLAGS="-D_GNU_SOURCE" + LIBS="$gringotts_LIBS" + + AC_CONFIG_FILES([ diff --git a/community/osmo/osmo.install b/community/osmo/osmo.install index 66b9463d4..7b592b432 100644 --- a/community/osmo/osmo.install +++ b/community/osmo/osmo.install @@ -1,5 +1,5 @@ post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index fb054c78f..f32be3a77 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $ +# $Id: PKGBUILD 99385 2013-10-28 09:51:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: Sirius Bakke <sirius\at/nonline.org> pkgname=pam_mount -pkgver=2.13 -pkgrel=5 +pkgver=2.14 +pkgrel=1 pkgdesc="A PAM module that can mount volumes for a user session" arch=('i686' 'x86_64') url="http://pam-mount.sourceforge.net/" @@ -13,14 +13,11 @@ depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup optdepends=('hxtools: If you have something like <logout wait="1000" hup="0" term="1" kill="1" /> in your config') backup=('etc/security/pam_mount.conf.xml') options=(!emptydirs !libtool) -source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" - "$pkgname-git.patch") -md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33' - 'f018cb901eb6a18447a3a1b0a50c14dd') +source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz") +md5sums=('5a130e59395cb88071b22cf5519bc681') build() { cd -- "$srcdir/$pkgname-$pkgver" - patch -p1 <$srcdir/$pkgname-git.patch aclocal libtoolize automake --add-missing diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 24d9dc11c..909641caa 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98017 2013-10-03 19:11:32Z arodseth $ +# $Id: PKGBUILD 99408 2013-10-28 11:45:43Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar @@ -6,16 +6,16 @@ pkgname=plan9port pkgver=20130927 -pkgrel=2 +pkgrel=3 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' arch=('x86_64' 'i686') url='http://swtch.com/plan9port/' license=('custom') -depends=('xorg-server' 'libxt' 'libxext' 'sh' 'fuse') +depends=('xorg-server' 'libxt' 'libxext' 'fuse') optdepends=('python2: for the codereview script') provides=('plan9') install='plan9.install' -options=('!zipman') +options=('!zipman' 'staticlibs') source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz" 'plan9.sh') sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542' diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index aac018b62..c2557b7d1 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 96894 2013-09-07 11:57:50Z arodseth $ +# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0.3 +pkgver=2.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming environment for creating images, animations and interactions' url='http://www.processing.org/' license=('GPL' 'LGPL') -depends=('libgl' 'sh' 'libxxf86vm') +depends=('libgl' 'libxxf86vm') makedepends=('gendesk') -options=(!strip) +options=('!strip') # 'staticlibs') -if [ "$CARCH" == "x86_64" ]; then +if [[ $CARCH == "x86_64" ]]; then source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('8d36995fb1ea0390fe6c3110372316c4b3f86e81af6a34d4e0227f4bb109f707' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') else source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('4dc0700fabce04465f1183c87939076655b9b055263cd0c5900d41bb4fa284e3' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') + sha256sums=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f' + '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') fi prepare() { - gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc" + gendesk -f -n --pkgname="$pkgname" --pkgdesc="$pkgdesc" } package() { cd "$pkgname-$pkgver" - install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/" + install -d "$pkgdir/usr/share/$pkgname/" + install -d "$pkgdir/usr/bin/" cp -r * "$pkgdir/usr/share/$pkgname/" ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java" diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD index edc92f438..2874782e0 100644 --- a/community/smalltalk/PKGBUILD +++ b/community/smalltalk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88644 2013-04-20 23:03:17Z arodseth $ +# $Id: PKGBUILD 99419 2013-10-28 12:43:23Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mrshpot <mrshpot at gmail dot com> @@ -6,14 +6,14 @@ pkgname=smalltalk pkgver=3.2.5 -pkgrel=1 +pkgrel=2 pkgdesc='Implementation of Smalltalk-80' url='http://smalltalk.gnu.org/' license=('GPL' 'LGPL') arch=('x86_64' 'i686') -options=('!libtool' '!emptydirs') +options=('!libtool' '!emptydirs' 'staticlibs') depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl') -makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip') +makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip') install="$pkgname.install" source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") sha256sums=('06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce') @@ -23,7 +23,7 @@ optdepends=('tk: for gst-blox' 'gtk2: GUI toolkit') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -42,13 +42,13 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" - #make check + make check || return 1 } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD index 2e69542a3..dc65c3841 100644 --- a/community/xcircuit/PKGBUILD +++ b/community/xcircuit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 97641 2013-09-26 10:52:31Z spupykin $ +# $Id: PKGBUILD 99387 2013-10-28 09:51:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Giovanni Scafora <linuxmania@gmail.com> # Contributor: simo <simo@archlinux.org> pkgname=xcircuit -pkgver=3.7.52 +pkgver=3.7.54 pkgrel=1 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL2') depends=('tk' 'libxpm' 'zlib') makedepends=('chrpath') source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz) -md5sums=('b39a2dcce9c3844ee2e6f9b477c501f5') +md5sums=('25e60837e5db6b4ff71615505493a481') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 1f62f28c3..e202076b4 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92482 2013-06-06 20:06:10Z jelle $ +# $Id: PKGBUILD 99437 2013-10-28 20:54:44Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar -pkgver=0.18 +pkgver=0.19 pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" @@ -11,7 +11,7 @@ license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' - 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-compat') + 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-base' 'haskell-regex-compat') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) @@ -28,4 +28,4 @@ package() { install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('4d0502fa75cd51ff23e41e1711f25adb') +md5sums=('1c5b6ac7e7afe837b79c10ae4e8b8e4d') diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index a32bbf391..059d7076a 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -5,22 +5,17 @@ pkgname=zathura-pdf-mupdf pkgver=0.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" license=('custom') depends=('mupdf>=1.3' 'zathura' - 'jbig2dec' 'openjpeg') + 'jbig2dec' 'openjpeg2') conflicts=('zathura-pdf-poppler') source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") md5sums=('42dcdf2511ffc8f87ca6baba6c566f91') -prepare() { - cd $srcdir/$pkgname-$pkgver - sed -i 's|openjp2|openjpeg|g' config.mk -} - build() { make -C "${srcdir}/$pkgname-$pkgver" } diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index e55adeaf5..706eb4f5c 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 195826 2013-10-01 16:41:14Z bpiotrowski $ +# $Id: PKGBUILD 197695 2013-10-28 15:56:31Z andyrtr $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db -pkgver=5.3.21 -pkgrel=2 +pkgver=5.3.28 +pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" license=('custom') depends=('gcc-libs' 'sh') -options=('!libtool') -install=db.install source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) -sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') +sha1sums=('fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9') build() { cd "${srcdir}"/$pkgname-${pkgver}/build_unix diff --git a/core/db/db.install b/core/db/db.install deleted file mode 100644 index 03b64042d..000000000 --- a/core/db/db.install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 5.1)" -lt 0 ]; then - echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." - fi -} diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index b8ff224f6..d8ae62387 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $ +# $Id: PKGBUILD 197682 2013-10-28 10:54:43Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk pkgver=4.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU version of awk" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gawk/" diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index ce5e3e8b8..c68038d1f 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 193578 2013-08-24 12:17:50Z tpowa $ +# $Id: PKGBUILD 197681 2013-10-28 10:54:42Z tpowa $ # Maintainer: pkgname=gettext pkgver=0.18.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gettext/" license=('GPL') groups=('base' 'base-devel') -depends=('gcc-libs' 'acl' 'sh' 'glib2') +depends=('gcc-libs' 'acl' 'sh' 'glib2' 'libunistring') optdepends=('cvs: for autopoint tool') options=(!libtool !docs) install=gettext.install diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 6a6040f5b..cb2cd9bc6 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $ +# $Id: PKGBUILD 197717 2013-10-28 22:26:50Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.7 -pkgrel=3 +pkgrel=4 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') url="http://www.nico.schottelius.org/software/gpm/" diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index a3c10cdca..7cbc47890 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196782 2013-10-19 06:36:42Z tpowa $ +# $Id: PKGBUILD 197680 2013-10-28 10:54:41Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -28,7 +28,13 @@ build() { cd $srcdir/pam_unix2-2.9.1 patch -Np1 -i ../pam_unix2-glibc216.patch - ./configure --libdir=/usr/lib --sbindir=/usr/bin + + # modify flags to build against the pam compiled here, not a system lib. + ./configure \ + CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \ + LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \ + --libdir=/usr/lib \ + --sbindir=/usr/bin make } diff --git a/core/pam/pam.install b/core/pam/pam.install deleted file mode 100644 index 55ea99700..000000000 --- a/core/pam/pam.install +++ /dev/null @@ -1,12 +0,0 @@ -# arg 1: the new package version -post_install() { - # need to run this immediately -- pacman only runs it at the end of - # all package installs - usr/bin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/core/pam/pam_namespace-build-1.1.6.patch b/core/pam/pam_namespace-build-1.1.6.patch deleted file mode 100644 index aeabc234c..000000000 --- a/core/pam/pam_namespace-build-1.1.6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/pam_namespace/Makefile~ 2012-10-12 10:59:13.557550706 +0200 -+++ modules/pam_namespace/Makefile 2012-10-12 10:59:13.564217270 +0200 -@@ -869,7 +869,7 @@ - - - install-data-local: -- mkdir -p $(namespaceddir) -+ mkdir -p $(DESTDIR)$(namespaceddir) - README: pam_namespace.8.xml namespace.conf.5.xml - -include $(top_srcdir)/Make.xml.rules - diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 11c38fa4f..65873259e 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196352 2013-10-12 07:52:54Z andyrtr $ +# $Id: PKGBUILD 197696 2013-10-28 15:56:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6.4 +pkgver=1.7.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,7 @@ url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz + http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2 cups.logrotate cups.pam # improve build and linking cups-no-export-ssllibs.patch @@ -30,19 +30,19 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch get-ppd-file-for-statically-configured-ipp-shared-queues.patch ppd-poll-with-client-conf.patch) -md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f' +md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' 'cc4101beccb5ed6deb1c92707a575925' '90c30380d4c8cd48a908cfdadae1ea24' - 'b4868b83f7f2d6ec24a1be76509379f0' + '555a1c71151ce990e176315b46e3de2f' 'a2a88b3a3257c3b5fd3edcc169e6aca4' '8fe27d4248cacbc02824e7937cab4088' 'df0c367c0022e3c7d8e01827e8a6c5e7' 'f30c2a161caaf27854581507cde8cac6' '5117f65342fcc69c6a506529e4daca9e' - '9247e218eea94ebda0aebc8ee0e77db8' + '451609db34f95209d64c38474de27ce1' 'cb58bf4e0b80eaee383712e5c84a1ab4' 'b578bcd17949a7203237ba1e31f78ef9' '0becd6ab8782b97f19a02c1dc174c75e') @@ -71,12 +71,12 @@ prepare() { patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll. - patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch +# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch # Applications could not get the PPD file for statically-configured IPP-shared print queues patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763 - patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch +# patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch # fix permissions on some files - alternative: cups-0755.patch by FC patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch # move /var/run -> /run for pid file @@ -200,7 +200,7 @@ optdepends=('xdg-utils: xdg .desktop file support') rm -v ${pkgdir}/usr/share/cups/banners/* rm -v ${pkgdir}/usr/share/cups/data/testprint # comment out all conversion rules which use any of the removed filters - perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs + perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs # Provide native service for arch-daemons generator ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service" diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch index 3e836657d..c44ebed07 100644 --- a/extra/cups/cups-1.6.2-statedir.patch +++ b/extra/cups/cups-1.6.2-statedir.patch @@ -1,12 +1,12 @@ diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 --- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 +++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 -@@ -429,7 +429,7 @@ - ;; - *) - # All others -- CUPS_STATEDIR="$localstatedir/run/cups" -+ CUPS_STATEDIR="/run/cups" - ;; - esac +@@ -420,7 +420,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac]) AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index 83fabdb4f..cfbe93354 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -1,7 +1,7 @@ -diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in ---- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 -+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 -@@ -506,6 +506,13 @@ +diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in +--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200 +@@ -451,6 +451,13 @@ /* @@ -15,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in * Various scripting languages... */ -diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 ---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 -+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 +diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4 +--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200 ++++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200 @@ -0,0 +1,36 @@ +dnl +dnl "$Id$" @@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con +dnl +dnl "$Id$" +dnl -diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in ---- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 +diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in +--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200 ++++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200 @@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) @@ -66,20 +66,20 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-scripting.m4) -@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs +@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs conf/snmp.conf cups-config data/testprint -+ data/cups.service -+ data/cups.socket -+ data/cups.path ++ data/cups.service ++ data/cups.socket ++ data/cups.path desktop/cups.desktop + doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html - doc/help/standard.html -diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c ---- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 -@@ -975,7 +975,7 @@ cups_read_client_conf( +diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c +--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200 ++++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200 +@@ -1046,7 +1046,7 @@ cups_read_client_conf( struct stat sockinfo; /* Domain socket information */ if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && @@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c cups_server = CUPS_DEFAULT_DOMAINSOCKET; else #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in ---- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 +diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in +--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 ++++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool @@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i + +[Install] +WantedBy=multi-user.target -diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in ---- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 +diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in +--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 ++++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200 @@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service @@ -114,9 +114,9 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in ---- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 -+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 +diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in +--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200 ++++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printing Service Sockets @@ -126,9 +126,9 @@ diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.sock + +[Install] +WantedBy=sockets.target -diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile ---- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 -+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 +diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile +--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200 @@ -100,6 +100,12 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ done @@ -152,10 +152,10 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile # -diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in ---- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 -+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 -@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ +diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in +--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200 ++++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200 +@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ @@ -163,13 +163,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in DNSSD_BACKEND = @DNSSD_BACKEND@ DSOFLAGS = -L../cups @DSOFLAGS@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) - DNSSDLIBS = @DNSSDLIBS@ +@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@ + IPPFIND_BIN = @IPPFIND_BIN@ + IPPFIND_MAN = @IPPFIND_MAN@ LAUNCHDLIBS = @LAUNCHDLIBS@ +SDLIBS = @SDLIBS@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ +@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@ DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DBUSDIR = @DBUSDIR@ @@ -177,9 +179,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in # -diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h ---- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 -+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 +diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h +--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200 @@ -77,6 +77,9 @@ typedef struct int fd; /* File descriptor for this server */ http_addr_t address; /* Bind address of socket */ @@ -190,9 +192,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien } cupsd_listener_t; -diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c ---- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 -+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 +diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c +--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200 @@ -401,7 +401,11 @@ cupsdStopListening(void) lis; lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) @@ -206,9 +208,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste { #ifdef WIN32 closesocket(lis->fd); -diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c ---- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 -+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 +diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c +--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200 ++++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200 @@ -26,6 +26,8 @@ * launchd_checkin() - Check-in with launchd and collect the listening * fds. @@ -229,7 +231,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) # include <malloc.h> #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -@@ -78,6 +84,9 @@ +@@ -83,6 +89,9 @@ static void launchd_checkin(void); static void launchd_checkout(void); #endif /* HAVE_LAUNCHD */ @@ -239,7 +241,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c static void parent_handler(int sig); static void process_children(void); static void sigchld_handler(int sig); -@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm +@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -253,7 +255,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * Startup the server... */ -@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm +@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -269,7 +271,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * Startup the server... */ -@@ -1516,6 +1541,102 @@ launchd_checkout(void) +@@ -1511,6 +1536,102 @@ launchd_checkout(void) } #endif /* HAVE_LAUNCHD */ @@ -372,10 +374,10 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * 'parent_handler()' - Catch USR1/CHLD signals... -diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile ---- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 -+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 -@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu +diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile +--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200 +@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ @@ -384,7 +386,7 @@ diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makef cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... -@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a +@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD index f77be22ec..d0ffb79d0 100644 --- a/extra/f2fs-tools/PKGBUILD +++ b/extra/f2fs-tools/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 197003 2013-10-21 12:37:50Z tpowa $ +# $Id: PKGBUILD 197684 2013-10-28 11:07:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> pkgname=f2fs-tools -pkgver=1.1.0_130404 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Tools for Flash-Friendly File System (F2FS)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/f2fs-tools/" depends=('util-linux') license=('GPL') -#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') -source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('0bb44c174a2da2a7dd1216cc46b4612c') +source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.2.0.tar.gz') +#source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") options=(!libtool) +md5sums=('d27ad7cd56f6001f7e1d508d85eef195') build() { cd "${pkgname}-${pkgver}" @@ -28,4 +28,3 @@ package() { make DESTDIR="${pkgdir}/" sbindir=/usr/bin install } - diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index 6c6fc9594..ef582b32c 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,63 +1,51 @@ -# $Id: PKGBUILD 150866 2012-02-23 13:12:25Z ibiru $ +# $Id: PKGBUILD 197692 2013-10-28 14:46:28Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-python-extras -pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') +pkgname=('gnome-python-extras' 'python2-egg' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=12 +pkgrel=13 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') -makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') +makedepends=('gtkspell' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2 gnome-python-extras-2.25.3-update-for-2.27.2.patch) md5sums=('9f3b7ec5c57130b96061cb486b79c076' '0b0a4d93016d14f2306682301de3bda3') sha1sums=('e69e5288466c960ed6f985bb10c9969b21ed85a4' 'b065efb7f7f5baa7b95b63bcadb6a4623d1bc9e5') +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../gnome-python-extras-2.25.3-update-for-2.27.2.patch +} + build() { - cd "${srcdir}/gnome-python-extras-${pkgver}" - patch -Np1 -i "${srcdir}"/gnome-python-extras-2.25.3-update-for-2.27.2.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make + cd $pkgbase-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-gksu --disable-gtkhtml2 --disable-gksu2 --disable-gksuui + make } package_gnome-python-extras() { - pkgdesc="Gnome Python interfaces for libraries not part of the core platform" - depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') + pkgdesc="Gnome Python interfaces for libraries not part of the core platform" + depends=('python2-egg' 'python2-gtkspell') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make install-pkgconfigDATA DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make install-pkgconfigDATA DESTDIR="${pkgdir}" } package_python2-egg(){ - pkgdesc="Python bindings for interacting with egg" - depends=('libgnomeui' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C egg install DESTDIR="${pkgdir}" -} - -package_python2-gksu2() { - pkgdesc="Python bindings for the gksu2" - depends=('libgksu' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gksu2 install DESTDIR="${pkgdir}" -} - -package_python2-gtkhtml2() { - pkgdesc="Python bindings for the gtkhtml2" - depends=('libgtkhtml' 'pygtk') + pkgdesc="Python bindings for interacting with egg" + depends=('libgnomeui' 'pygtk') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkhtml2 install DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make -C egg install DESTDIR="${pkgdir}" } package_python2-gtkspell() { - pkgdesc="Python bindings for the gtkspell" - depends=('gtkspell' 'pygtk') + pkgdesc="Python bindings for the gtkspell" + depends=('gtkspell' 'pygtk') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkspell install DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make -C gtkspell install DESTDIR="${pkgdir}" } diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 86ad80d34..fe380c773 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $ +# $Id: PKGBUILD 197662 2013-10-28 01:29:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64') url="http://musicbrainz.org/doc/libdiscid" license=('LGPL') depends=('glibc') -options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") md5sums=('98c4b281780707e6b446cc526a825e7a') diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index ac4a04c7c..d14311bd5 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 195484 2013-10-01 06:01:26Z bpiotrowski $ +# $Id: PKGBUILD 197664 2013-10-28 02:02:53Z eric $ +# Maintainer: # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss pkgver=1.2.13 -pkgrel=2 +pkgrel=3 pkgdesc="Portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -options=('!libtool' '!docs' '!emptydirs') +options=('!docs' '!emptydirs') source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD index c72cc5b5c..aaf925e09 100644 --- a/extra/libglade/PKGBUILD +++ b/extra/libglade/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197348 2013-10-25 02:47:37Z allan $ +# $Id: PKGBUILD 197694 2013-10-28 14:56:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libglade pkgver=2.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="Allows you to load glade interface files in a program at runtime" arch=(i686 x86_64) license=('LGPL') @@ -17,15 +17,19 @@ url="http://www.gnome.org" md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' '4f879c0ce550004905aa0fb24f25c353') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../libglade-2.0.1-nowarning.patch +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" - PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install install -m755 libglade-convert "${pkgdir}/usr/bin/" } diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD index dddbeb21e..c04b9767d 100644 --- a/extra/libgnomekbd/PKGBUILD +++ b/extra/libgnomekbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169950 2012-10-30 22:46:37Z heftig $ +# $Id: PKGBUILD 197690 2013-10-28 14:25:11Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomekbd pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-schemas-compile + --disable-schemas-compile --disable-static make } diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD deleted file mode 100644 index 354ced8c4..000000000 --- a/extra/libgtkhtml/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 148828 2012-02-05 11:51:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgtkhtml -pkgver=2.11.1 -pkgrel=4 -pkgdesc="An HTML library for GTK" -arch=(i686 x86_64) -license=('LGPL') -depends=('gtk2>=2.22.1' 'libxml2>=2.7.8') -makedepends=('perlxml') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a1d1a197dcff8c4571659deef5495e24') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD index 9b0537d36..d098af445 100644 --- a/extra/libieee1284/PKGBUILD +++ b/extra/libieee1284/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 150619 2012-02-18 23:03:40Z pierre $ +# $Id: PKGBUILD 197666 2013-10-28 02:14:49Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=libieee1284 pkgver=0.2.11 -pkgrel=4 -pkgdesc="A library to query devices connected in parallel port." +pkgrel=5 +pkgdesc="A library to query devices connected in parallel port" arch=('i686' 'x86_64') license=('GPL2') url="http://cyberelk.net/tim/libieee1284" depends=('python2') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir"/ install } diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD index a268177c5..cfa4b4e4e 100644 --- a/extra/libmpd/PKGBUILD +++ b/extra/libmpd/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 136733 2011-08-31 19:31:16Z eric $ +# $Id: PKGBUILD 197668 2013-10-28 02:28:33Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: tobias <tobias@archlinux.org> pkgname=libmpd pkgver=11.8.17 -pkgrel=1 +pkgrel=2 pkgdesc="Signal based wrapper around libmpdclient" arch=('i686' 'x86_64') url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" license=('GPL') depends=('glib2') -options=('!libtool') source=(http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) md5sums=('5ae3d87467d52aef3345407adb0a2488') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD index 4604e91a0..76f3bd7aa 100644 --- a/extra/libofa/PKGBUILD +++ b/extra/libofa/PKGBUILD @@ -1,41 +1,46 @@ -# $Id: PKGBUILD 150605 2012-02-18 22:48:27Z pierre $ +# $Id: PKGBUILD 197670 2013-10-28 02:51:05Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libofa pkgver=0.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="An open-source audio fingerprint by MusicIP" arch=('i686' 'x86_64') url="http://code.google.com/p/musicip-libofa/" license=('GPL2' 'custom') depends=('expat' 'curl' 'fftw') -makedepends=('pkgconfig') -options=('!libtool') source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz" 'gcc-4.patch' 'gcc4.3.patch' 'gcc4.5.patch' - 'libofa-0.9.3-curl-7.21.patch') + 'libofa-0.9.3-curl-7.21.patch' + 'libofa-0.9.3-gcc-4.7.patch') md5sums=('51507d2c4b432bd2755f48d58471696e' 'a6f78b90bd0f4354d022a71c3e58ef6c' 'dd57db13770b8f8d196e8a3d3a50e713' 'c245363368d0e6fa2b4676364b81b74f' - '2e1579d74613cfbb1799d0ab5f1a4cba') + '2e1579d74613cfbb1799d0ab5f1a4cba' + 'a53a0104f9b5bba220322c6d0b68bf96') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/gcc-4.patch" + patch -p1 -i "${srcdir}/gcc4.3.patch" + patch -p1 -i "${srcdir}/gcc4.5.patch" + patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch" + patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ${srcdir}/gcc-4.patch - patch -p1 -i ${srcdir}/gcc4.3.patch - patch -p1 -i ${srcdir}/gcc4.5.patch - patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libofa/libofa-0.9.3-gcc-4.7.patch b/extra/libofa/libofa-0.9.3-gcc-4.7.patch new file mode 100644 index 000000000..c5ab09876 --- /dev/null +++ b/extra/libofa/libofa-0.9.3-gcc-4.7.patch @@ -0,0 +1,22 @@ +diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp +--- libofa-0.9.3/examples/uselame.cpp.gcc47 2012-01-14 09:35:24.343146853 -0600 ++++ libofa-0.9.3/examples/uselame.cpp 2012-01-14 09:35:49.956826634 -0600 +@@ -12,6 +12,7 @@ + #else + #include <sys/wait.h> + #endif ++#include <unistd.h> + + AudioData *loadWaveFile(char *file); + +diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp +--- libofa-0.9.3/examples/wavefile.cpp.gcc47 2012-01-14 09:35:24.344146841 -0600 ++++ libofa-0.9.3/examples/wavefile.cpp 2012-01-14 16:00:54.414981160 -0600 +@@ -11,6 +11,7 @@ + #include "io.h" + #endif + #include <fcntl.h> ++#include <unistd.h> + + static bool readBytes(int fd, unsigned char *buf, int size) { + int ct = 0; diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index e7dc2ef53..b62904898 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $ +# $Id: PKGBUILD 197714 2013-10-28 19:33:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" @@ -38,7 +38,6 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - chmod 644 "$pkgdir"/usr/lib/*.a ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc" rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \ "$pkgdir/usr/include/nspr/md" diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD index 1e47872f1..eedfaa0cc 100644 --- a/extra/orbit2/PKGBUILD +++ b/extra/orbit2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151081 2012-02-24 18:27:05Z ibiru $ +# $Id: PKGBUILD 197706 2013-10-28 17:41:15Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=orbit2 @@ -8,7 +8,7 @@ pkgdesc="Thin/fast CORBA ORB" arch=('i686' 'x86_64') license=('LGPL' 'GPL') depends=('libidl2') -options=('!libtool' '!makeflags') +options=('!libtool' '!makeflags' 'staticlibs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2) sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550') diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 857fa291d..d55131804 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190813 2013-07-17 15:53:04Z heftig $ +# $Id: PKGBUILD 197716 2013-10-28 19:43:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.16 +pkgver=2.17 pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") -md5sums=('bd7afcd949023ed2f3e9d9294848ad19') +md5sums=('d8b809f6efe3edb33f81d608c932b2ef') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 3d58eeb0d..0466641d2 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $ +# $Id: PKGBUILD 197671 2013-10-28 05:19:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,24 +8,26 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=4.0 -pkgrel=2 +pkgrel=5 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(GPL LGPL) +license=(LGPL AGPL3) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc + speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing - check) + check git) options=(!emptydirs !libtool) -source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de pulseaudio.xinit) -sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae' +sha256sums=('SKIP' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + build() { cd $pkgbase-$pkgver - ./configure --prefix=/usr \ + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -45,13 +47,13 @@ package_pulseaudio() { depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc libsamplerate webrtc-audio-processing sbc) optdepends=('avahi: zeroconf support' - 'bluez4: bluetooth support' + 'bluez: bluetooth support' 'bluez-libs: bluetooth support' 'gconf: configuration through gconf (paprefs)' 'jack: jack support' 'lirc-utils: infra-red support' 'openssl: RAOP support' - 'python2-pyqt: Equalizer GUI (qpaeq)') + 'python-pyqt: Equalizer GUI (qpaeq)') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install @@ -63,10 +65,9 @@ package_pulseaudio() { sed -e '/autospawn/iautospawn=no' \ -i "$pkgdir/etc/pulse/client.conf" - # Speed up pulseaudio shutdown - # Lower resample quality, saves CPU + # Speed up pulseaudio shutdown so that it exits immediately with + # the last user session (module-systemd-login keeps it alive) sed -e '/exit-idle-time/iexit-idle-time=0' \ - -e '/resample-method/iresample-method=speex-float-0' \ -i "$pkgdir/etc/pulse/daemon.conf" # Disable cork-request module, can result in e.g. media players unpausing @@ -74,20 +75,10 @@ package_pulseaudio() { sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ -i "$pkgdir/usr/bin/start-pulseaudio-x11" - # Make ConsoleKit optional - sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -i "$pkgdir/etc/pulse/default.pa" - - # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - # cap is handled in .install - chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" - install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" @@ -125,6 +116,7 @@ package_libpulse() { optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) + license=(LGPL) mv "$srcdir"/libpulse/* "$pkgdir" } diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 9de8b0e8f..bed542ca8 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -1,9 +1,4 @@ -_common() { - setcap cap_net_raw=ep usr/lib/pulse/proximity-helper 2>/dev/null || chmod +s usr/lib/pulse/proximity-helper -} - post_install() { - _common cat << MES >>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details on configuring your system for PulseAudio. @@ -13,12 +8,11 @@ MES } post_upgrade() { - _common cat << MES >>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync - with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio - may refuse to start due to configuration errors. + daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you + keep them in sync with changes to the packaged files in /etc/pulse/. + Otherwise, PulseAudio may refuse to start due to configuration errors. MES if (( $(vercmp $2 3.0-3) < 0 )); then cat << MES diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index c3d783bf9..76274656d 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193422 2013-08-20 06:10:08Z angvp $ +# $Id: PKGBUILD 197708 2013-10-28 18:10:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,12 +6,13 @@ pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://www.numpy.org/" -makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose') +makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose') +options=('staticlibs') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') @@ -33,7 +34,7 @@ build() { package_python2-numpy() { depends=('lapack' 'python2') - optdepends=('python-nose: testsuite') + optdepends=('python2-nose: testsuite') _pyver=2.7 @@ -57,6 +58,7 @@ package_python2-numpy() { package_python-numpy() { depends=('lapack' 'python') + optdepends=('python-nose: testsuite') provides=("python3-numpy=${pkgver}") replaces=('python3-numpy') conflicts=('python3-numpy') diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index b872b91ac..24db28655 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $ +# $Id: PKGBUILD 197703 2013-10-28 17:39:46Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -18,13 +18,18 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' 'saned.socket' 'saned.service' - 'network.patch') + 'network.patch' + 'segfault-avahi-fix-kodakio.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch + # fix http://anonscm.debian.org/gitweb/?p=sane/sane-backends.git;a=commit;h=37523b867d411c2f82d08128246be7e38bc9812c + # #37525 + # https://alioth.debian.org/tracker/?group_id=30186&atid=410366&func=detail&aid=314301 + patch -Np1 -i ${srcdir}/segfault-avahi-fix-kodakio.patch } build() { @@ -69,4 +74,5 @@ md5sums=('1ca68e536cd7c1852322822f5f6ac3a4' 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' - '44e77692c52db15b0f530a1d9a8e1296') + '44e77692c52db15b0f530a1d9a8e1296' + '039524a38af8721f2e97d45e889295ca') diff --git a/extra/sane/segfault-avahi-fix-kodakio.patch b/extra/sane/segfault-avahi-fix-kodakio.patch new file mode 100644 index 000000000..23f9d1ca9 --- /dev/null +++ b/extra/sane/segfault-avahi-fix-kodakio.patch @@ -0,0 +1,98 @@ +From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001 +From: Paul Newall <quandry@ntlworld.com> +Date: Mon, 14 Oct 2013 22:22:53 +0100 +Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners + return unexpected data via avahi auto discovery + +--- + backend/kodakaio.c | 43 ++++++++++++++++++++++++++++++---------- + doc/descriptions/kodakaio.desc | 2 +- + 3 files changed, 37 insertions(+), 12 deletions(-) + +diff --git a/backend/kodakaio.c b/backend/kodakaio.c +index 8c4583a..b442e50 100644 +--- a/backend/kodakaio.c ++++ b/backend/kodakaio.c +@@ -127,7 +127,7 @@ for ubuntu 12.10 + + #define KODAKAIO_VERSION 02 + #define KODAKAIO_REVISION 4 +-#define KODAKAIO_BUILD 6 ++#define KODAKAIO_BUILD 7 + + /* for usb (but also used for net though it's not required). */ + #define MAX_BLOCK_SIZE 32768 +@@ -2184,6 +2184,7 @@ static void resolve_callback( + AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + ++ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL; + char *pidkey, *pidvalue; + char *vidkey, *vidvalue; + size_t valuesize; +@@ -2204,20 +2205,40 @@ static void resolve_callback( + avahi_address_snprint(a, sizeof(a), address); + + /* Output short for Kodak ESP */ +- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), +- &vidkey, &vidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), +- &pidkey, &pidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name); + ++ vid_pair_list = avahi_string_list_find(txt, "vid"); ++ if(vid_pair_list != NULL) { ++ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key vid\n"); ++ ++ pid_pair_list = avahi_string_list_find(txt, "pid"); ++ if(pid_pair_list != NULL) { ++ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key pid\n"); ++ ++ if(pid_pair_list != NULL && vid_pair_list != NULL) { + ProcessAvahiDevice(name, vidvalue, pidvalue, a); +- avahi_free(vidkey); avahi_free(vidvalue); +- avahi_free(pidkey); avahi_free(pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n"); ++ ++ if(vid_pair_list != NULL) { ++ avahi_free(vidkey); ++ avahi_free(vidvalue); ++ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n"); ++ } ++ if(pid_pair_list != NULL) { ++ avahi_free(pidkey); ++ avahi_free(pidvalue); ++ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n"); ++ } + } + } +- ++ DBG(min(10,DBG_AUTO), "ending resolve_callback\n"); + avahi_service_resolver_free(r); + } + +diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc +index 7882513..5fb18ed 100644 +--- a/doc/descriptions/kodakaio.desc ++++ b/doc/descriptions/kodakaio.desc +@@ -1,6 +1,6 @@ + :backend "kodakaio" + :url "http://sourceforge.net/projects/cupsdriverkodak/" +-:version "2.4.6" ++:version "2.4.7" + :manpage "sane-kodakaio" + :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10" + :devicetype :scanner +-- +1.7.10.4 + diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index a3b18fe7f..1cfb22527 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196663 2013-10-16 09:25:32Z jgc $ +# $Id: PKGBUILD 197688 2013-10-28 13:45:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.22 -pkgrel=1 +pkgver=0.9.23 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -13,13 +13,13 @@ makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') backup=('etc/UPower/UPower.conf') options=('!libtool') source=($url/releases/$pkgname-$pkgver.tar.xz - git-fixes.patch) -md5sums=('22b0b13c16ceb1516b5edf5cf0e99d6d' - 'd47377f5f8a02e38f81b6a63d8a19ef3') + linux-clamp-percentage-for-overfull-batteries.patch) +md5sums=('39cfd97bfaf7d30908f20cf937a57634' + 'cd8eeb40c2338d28df46e22529bece62') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch + patch -Np1 -i ../linux-clamp-percentage-for-overfull-batteries.patch } build() { diff --git a/extra/upower/git-fixes.patch b/extra/upower/git-fixes.patch deleted file mode 100644 index 83c407454..000000000 --- a/extra/upower/git-fixes.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e4858d94343bba2afbebcd1a4925c981a38a9579 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 10 Oct 2013 16:32:41 +0000 -Subject: up-client: Really don't overwrite retval with prop values - -db89e5a32bf2c16c0d3d00f6c8f0ef7e5e7efa8f was incomplete and -"ret" was being used instead of prop_val to set some of those -properties. It's likely your laptop would have been seen as -docked for example. ---- -diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c -index 757e4a1..2334a68 100644 ---- a/libupower-glib/up-client.c -+++ b/libupower-glib/up-client.c -@@ -360,7 +360,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - - prop_val = g_value_get_boolean (value) && allowed; - if (prop_val != client->priv->can_suspend) { -- client->priv->can_suspend = ret; -+ client->priv->can_suspend = prop_val; - g_object_notify (G_OBJECT(client), "can-suspend"); - } - -@@ -376,7 +376,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - - prop_val = g_value_get_boolean (value) && allowed; - if (prop_val != client->priv->can_hibernate) { -- client->priv->can_hibernate = ret; -+ client->priv->can_hibernate = prop_val; - g_object_notify (G_OBJECT(client), "can-hibernate"); - } - #endif /* ENABLE_DEPRECATED */ -@@ -388,7 +388,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_is_closed) { -- client->priv->lid_is_closed = ret; -+ client->priv->lid_is_closed = prop_val; - g_object_notify (G_OBJECT(client), "lid-is-closed"); - } - -@@ -399,7 +399,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->on_battery) { -- client->priv->on_battery = ret; -+ client->priv->on_battery = prop_val; - g_object_notify (G_OBJECT(client), "on-battery"); - } - -@@ -410,7 +410,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->on_low_battery) { -- client->priv->on_low_battery = ret; -+ client->priv->on_low_battery = prop_val; - g_object_notify (G_OBJECT(client), "on-low-battery"); - } - -@@ -421,7 +421,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_is_present) { -- client->priv->lid_is_present = ret; -+ client->priv->lid_is_present = prop_val; - g_object_notify (G_OBJECT(client), "lid-is-present"); - } - -@@ -431,8 +431,8 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - goto out; - } - prop_val = g_value_get_boolean (value); -- if (ret != client->priv->is_docked) { -- client->priv->is_docked = ret; -+ if (prop_val != client->priv->is_docked) { -+ client->priv->is_docked = prop_val; - g_object_notify (G_OBJECT(client), "is-docked"); - } - -@@ -443,7 +443,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_force_sleep) { -- client->priv->lid_force_sleep = ret; -+ client->priv->lid_force_sleep = prop_val; - g_object_notify (G_OBJECT(client), "lid-force-sleep"); - } - --- -cgit v0.9.0.2-2-gbebe -From d43ab28a29420a61d031908abbf1d13b2cb35796 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 10 Oct 2013 16:59:08 +0000 -Subject: lib: Fix a small memory leak - -The bus was never unreferenced in the UpWakeups object. ---- -diff --git a/libupower-glib/up-wakeups.c b/libupower-glib/up-wakeups.c -index 3729ad7..ed6bf80 100644 ---- a/libupower-glib/up-wakeups.c -+++ b/libupower-glib/up-wakeups.c -@@ -377,6 +377,8 @@ up_wakeups_finalize (GObject *object) - g_object_unref (wakeups->priv->proxy); - if (wakeups->priv->prop_proxy != NULL) - g_object_unref (wakeups->priv->prop_proxy); -+ if (wakeups->priv->bus) -+ dbus_g_connection_unref (wakeups->priv->bus); - - G_OBJECT_CLASS (up_wakeups_parent_class)->finalize (object); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch new file mode 100644 index 000000000..6e643c42d --- /dev/null +++ b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch @@ -0,0 +1,72 @@ +From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martinpitt@gnome.org> +Date: Tue, 22 Oct 2013 08:02:51 +0000 +Subject: linux: Clamp percentage for overfull batteries + +Some batteries report energy > energy_full and a percentage ("capacity" +attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well +as to avoid setting an out-of-range property which would then become 0%. + +https://launchpad.net/bugs/1240673 +--- +diff --git a/src/linux/integration-test b/src/linux/integration-test +index 8489bf3..4be1922 100755 +--- a/src/linux/integration-test ++++ b/src/linux/integration-test +@@ -442,6 +442,39 @@ class Tests(unittest.TestCase): + self.assertEqual(self.get_dbus_property('OnLowBattery'), False) + self.stop_daemon() + ++ def test_battery_overfull(self): ++ '''battery which reports a > 100% percentage for a full battery''' ++ ++ self.testbed.add_device('power_supply', 'BAT0', None, ++ ['type', 'Battery', ++ 'present', '1', ++ 'status', 'Full', ++ 'current_now', '1000', ++ 'charge_now', '11000000', ++ 'charge_full', '10000000', ++ 'charge_full_design', '11000000', ++ 'capacity', '110', ++ 'voltage_now', '12000000'], []) ++ ++ self.start_daemon() ++ devs = self.proxy.EnumerateDevices() ++ self.assertEqual(len(devs), 1) ++ bat0_up = devs[0] ++ ++ # should clamp percentage ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'), ++ UP_DEVICE_STATE_FULLY_CHARGED) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0) ++ # should adjust EnergyFull to reality, not what the battery claims ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2) ++ self.stop_daemon() ++ + def test_battery_temperature(self): + '''battery which reports temperature''' + +diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c +index 8020277..b953d65 100644 +--- a/src/linux/up-device-supply.c ++++ b/src/linux/up-device-supply.c +@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) + /* get a precise percentage */ + if (sysfs_file_exists (native_path, "capacity")) { + percentage = sysfs_get_double (native_path, "capacity"); ++ if (percentage < 0.0f) ++ percentage = 0.0f; ++ if (percentage > 100.0f) ++ percentage = 100.0f; + /* for devices which provide capacity, but not {energy,charge}_now */ + if (energy < 0.1f && energy_full > 0.0f) + energy = energy_full * percentage / 100; +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index db92fa191..3559adcf4 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 98781 2013-10-18 14:05:15Z tredaelli $ +# $Id: PKGBUILD 99405 2013-10-28 11:43:52Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.3.0 +pkgver=3.4.0 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'jansson' 'libusbx' 'lm_sensors') +depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors') makedepends=('uthash' 'yasm') replaces=$_pkgname conflicts=$_pkgname @@ -18,7 +18,7 @@ license=('GPL3') options=(!libtool) source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('773435dafb9b13c4450480a7731d024ffb2b7ac34d8511c9325d2a703f339ef6' +sha256sums=('5367802f303917810236be092a09400c6e105efc348eadcf27bdcea526728d67' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { @@ -31,7 +31,12 @@ prepare() { build() { cd "$srcdir"/$_pkgname-$pkgver - ./configure --prefix=/usr --enable-cpumining --enable-scrypt + ./configure --prefix=/usr \ + --enable-cpumining \ + --enable-bfsb \ + --enable-metabank \ + --enable-scrypt + # --enable-knc (FS#33640) make } diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 0d2f2d8ea..49fcabcfe 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -5,36 +5,29 @@ pkgname=pandoc-static _pkgname=pandoc -pkgver=1.12 +pkgver=1.12.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') +# Needed for pandoc-citeproc +depends=('icu>=52' 'icu<=53') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) -#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} SRCBUILD) -# citeproc-hs-pre-0.3.7.patch) replaces=('pandoc') provides=('pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('3d5f23060cad2ff29ba2df5651e92f8a' - 'SKIP' - 'c2e9f9b880468455b6e6a7f9ba7308e8') # PKGBUILD functions build() { - mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} - cd ${srcdir}/${_pkgname}-${pkgver} + mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}} + cd ${srcdir}/${_pkgname}-${pkgver} -# Patches from the next citeproc-hs release -# These are needed because 0.3.6 with embed_data_files is broken -# darcs diff --from-tag=0.3.6 -# pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6 -# patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch -# popd +# pandoc-citeproc needs hsb2hs + export PATH=${srcdir}/build/usr/bin:$PATH while read _hkpkg; do # Skip already built @@ -47,23 +40,29 @@ build() { case $_hkpkg in $_pkgname-$pkgver) HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal configure --flags='-library' \ - --prefix=/usr \ + cabal configure --prefix=/usr \ --libdir=${srcdir}/build/usr/lib -v HOME=${srcdir}/${_pkgname}-${pkgver} \ cabal build + + HOME=${srcdir}/${_pkgname}-${pkgver} \ + cabal register --inplace ;; - citeproc-hs-*) + pandoc-citeproc*) + HOME=${srcdir}/${_pkgname}-${pkgver} \ + cabal configure --flags='small_base embed_data_files bibutils hexpat unicode_collation' \ + --libdir=${srcdir}/build/usr/lib \ + --prefix=/usr -v + HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal install --flags='embed_data_files' \ - --prefix=${srcdir}/build/usr -v + cabal build ;; *) HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal install --prefix=${srcdir}/build/usr + cabal install --prefix=${srcdir}/build/usr --flags="embed_data_files" ;; esac @@ -77,11 +76,16 @@ package() { runghc Setup.hs copy --destdir=${pkgdir}/ + cd ${srcdir}/${_pkgname}-${pkgver}/pandoc-citeproc* + runghc Setup.hs copy --destdir=${pkgdir}/ + # For some reason the library is installed anyway # Remove all files and !emptydirs takes care of the rest msg2 "Removing lib files..." find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf + cp -av ${srcdir}/build/usr/bin/* ${pkgdir}/usr/bin/ + # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex @@ -90,6 +94,9 @@ package() { find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; msg2 "Installing licenses" - install -d ${pkgdir}/usr/share - cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/ + install -d ${pkgdir}/usr/share/licenses + cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/ } +sha256sums=('4cbeb1b112985961ff78b9baaa4cca3b24e5996c243c790fa00bbe44052cd418' + 'SKIP' + '25fae3ded388733915dbaca9970ac5f5ef53883410564305bd225a950e5951db') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index f822bb1a0..242356c89 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,7 +2,7 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.12 +pkgver=1.12.1 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -21,12 +21,14 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver} + cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run hsb2hs ${pkgname}-${pkgver} pandoc-citeproc | + grep "\-[0-9]\+" | + tee BUILDORDER } package() { diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 5b8828b77..c877a3b27 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.10.23.2 +pkgver=2013.10.28 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -27,5 +27,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('72208a4aae88a51e1fba5d73cd5d7652' +md5sums=('cf6169efa73e6d546221eff89937bb85' 'SKIP') |