diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-13 10:28:49 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-13 10:28:49 +0200 |
commit | 81dced2a29e3d4cb05f004e5efe3bd2abe207b15 (patch) | |
tree | 9772090003f7b9871a0a4d19f65f8fa32c9409c8 | |
parent | 1f5072dbfe77090d9ea49bdd7501f21892729d88 (diff) | |
parent | 843685ce9dd76d37a4c7b0230eacb6d26bdf30dd (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/happy/PKGBUILD
community-staging/haskell-dataenc/PKGBUILD
community-staging/haskell-quickcheck/PKGBUILD
community/gnonlin/PKGBUILD
extra/bochs/PKGBUILD
38 files changed, 765 insertions, 119 deletions
diff --git a/community-staging/alex/PKGBUILD b/community-staging/alex/PKGBUILD new file mode 100644 index 000000000..eadf607c6 --- /dev/null +++ b/community-staging/alex/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 76079 2012-09-11 04:43:36Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Philip Nilsson <pnilsson@nullref.se> + +pkgname=alex +pkgver=3.0.2 +pkgrel=2 +pkgdesc='a lexical analyser generator for Haskell' +arch=('i686' 'x86_64') +url='http://hackage.haskell.org/package/alex' +license=('custom:BSD3') +depends=('gmp') +makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') + +build() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname + runghc Setup.lhs build +} + +package() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs copy --destdir=$pkgdir + install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 + + # doc/ contains only license which already installed into proper place + rm -rf $pkgdir/usr/share/doc +} diff --git a/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch new file mode 100644 index 000000000..1c6a7dd65 --- /dev/null +++ b/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch @@ -0,0 +1,69 @@ +From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Wed, 12 Sep 2012 03:29:46 -0700 +Subject: [PATCH] fix for ghc 7.6.1 changes + +--- + c2hs/base/general/FileOps.hs | 3 ++- + c2hs/base/state/StateTrans.hs | 3 ++- + c2hs/toplevel/C2HSConfig.hs | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs +index 83ac70c..4914c4b 100644 +--- a/c2hs/base/general/FileOps.hs ++++ b/c2hs/base/general/FileOps.hs +@@ -39,6 +39,7 @@ import Control.Monad (liftM) + import System.Random (newStdGen, randomRs) + + import FNameOps (dirname, stripDirname, addPath) ++import System.IO.Error (catchIOError) + + + -- search for the given file in the given list of directories (EXPORTED) +@@ -89,7 +90,7 @@ mktemp pre post = + in do + h <- openFile fname ReadWriteMode + return (h, fname) +- `catch` \_ -> createLoop (attempts - 1) rs' ++ `catchIOError` \_ -> createLoop (attempts - 1) rs' + -- + sixChars :: [Int] -> ([Int], String) + sixChars is = +diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs +index ada62f4..2ab0ad1 100644 +--- a/c2hs/base/state/StateTrans.hs ++++ b/c2hs/base/state/StateTrans.hs +@@ -84,6 +84,7 @@ import System.IO (fixIO) + import Data.IORef (IORef, newIORef, readIORef, writeIORef) + + import Errors (interr) ++import System.IO.Error (catchIOError) + + infixr 1 +>=, +> + +@@ -337,7 +338,7 @@ fatalsHandledBy m handler = + ioError err + Right a -> return state + ) +- `catch` (\err -> let ++ `catchIOError` (\err -> let + STB handler' = handler err + in + handler' bs gs) +diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs +index e8deddf..af32886 100644 +--- a/c2hs/toplevel/C2HSConfig.hs ++++ b/c2hs/toplevel/C2HSConfig.hs +@@ -46,7 +46,7 @@ import Data.Array (Array, array) + + import Foreign (Ptr, FunPtr) + import Foreign (Storable(sizeOf, alignment), toBool) +-import Foreign.C (CInt) ++import Foreign.C (CInt(..)) + import System.Info (os) + + -- program settings +-- +1.7.12 + diff --git a/community-staging/gtk2hs-buildtools/PKGBUILD b/community-staging/gtk2hs-buildtools/PKGBUILD new file mode 100644 index 000000000..e0e928514 --- /dev/null +++ b/community-staging/gtk2hs-buildtools/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 76136 2012-09-12 03:36:40Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=gtk2hs-buildtools +pkgver=0.12.3.1 +pkgrel=2 +pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." +url="http://hackage.haskell.org/package/gtk2hs-buildtools" +license=('GPL2') +arch=('i686' 'x86_64') +makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3') +depends=('gmp') +options=('strip') +provides=('haskell-gtk2hs-buildtools') +source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz + '0001-fix-for-ghc-7.6.1-changes.patch') +md5sums=('612611d831635024c953d2817b124e29' + 'b6551d8085c97bc2c6600ab397833101') + +build() { + cd ${srcdir}/gtk2hs-buildtools-$pkgver + + patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch + + runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} + runhaskell Setup build +} + +package() { + cd ${srcdir}/gtk2hs-buildtools-$pkgver + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch new file mode 100644 index 000000000..2e687db21 --- /dev/null +++ b/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch @@ -0,0 +1,33 @@ +From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 07:43:41 -0700 +Subject: [PATCH] fix incorrect types in documentation/haddock + +--- + src/Documentation/Haddock.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs +index 60bb314..8fd9674 100644 +--- a/src/Documentation/Haddock.hs ++++ b/src/Documentation/Haddock.hs +@@ -59,6 +59,7 @@ import Haddock.Types + import Haddock.Options + import Haddock.Utils + import Main ++import GHC (Ghc) + + + -- | Create 'Interface' structures from a given list of Haddock command-line +@@ -68,7 +69,7 @@ import Main + createInterfaces + :: [Flag] -- ^ A list of command-line flags + -> [String] -- ^ File or module names +- -> IO [Interface] -- ^ Resulting list of interfaces ++ -> Ghc [Interface] -- ^ Resulting list of interfaces + createInterfaces flags modules = do + (_, ifaces, _) <- readPackagesAndProcessModules flags modules + return ifaces +-- +1.7.12 + diff --git a/community-staging/haddock/PKGBUILD b/community-staging/haddock/PKGBUILD new file mode 100644 index 000000000..274cc7851 --- /dev/null +++ b/community-staging/haddock/PKGBUILD @@ -0,0 +1,50 @@ +# 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.12.0 +pkgrel=1 +pkgdesc="Tool for generating documentation for Haskell libraries" +url="http://hackage.haskell.org/package/haddock" +license=('custom:BSD3') +arch=('x86_64' 'i686') +makedepends=('alex=3.0.2-2' 'happy=1.18.9-6') +depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9') +install=$pkgname.install +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + '0001-fix-incorrect-types-in-documentation-haddock.patch') +sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02' + 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch + + 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/$pkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" + mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/haddock/haddock.install b/community-staging/haddock/haddock.install new file mode 100644 index 000000000..24e27a074 --- /dev/null +++ b/community-staging/haddock/haddock.install @@ -0,0 +1,25 @@ +pkgname=haddock +HS_DIR=usr/share/haskell/haddock + +post_upgrade() { + ${HS_DIR}/register.sh &> /dev/null + post_remove +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null +} + +pre_remove() { + ${HS_DIR}/unregister.sh &> /dev/null +} + +post_install() { + post_upgrade +} + +pre_upgrade() { + pre_remove +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-bytestring-show/PKGBUILD b/community-staging/haskell-bytestring-show/PKGBUILD new file mode 100644 index 000000000..3b45dcd16 --- /dev/null +++ b/community-staging/haskell-bytestring-show/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 76081 2012-09-11 04:59:02Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-bytestring-show +pkgver=0.3.5.3 +pkgrel=1 +pkgdesc="Efficient conversion of values into readable byte strings." +url="http://hackage.haskell.org/package/bytestring-show" +license=("BSD3") +arch=('i686' 'x86_64') +depends=("ghc=7.6.1-1") +install="${pkgname}.install" +source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") +md5sums=('cbcc94f57fc754685f428aba003ba058') + +build() { + cd ${srcdir}/bytestring-show-${pkgver} + + # update outdated dependency + sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal + + 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}/bytestring-show-${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/bytestring-show + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install new file mode 100644 index 000000000..335fc37cd --- /dev/null +++ b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install @@ -0,0 +1,24 @@ +pkgname=haskell-bytestring-show +HS_DIR=usr/share/haskell/${pkgname} + +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch new file mode 100644 index 000000000..b8c2264bc --- /dev/null +++ b/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch @@ -0,0 +1,50 @@ +From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 06:24:09 -0700 +Subject: [PATCH] update changed time code for ghc 7.6.1 + +--- + Codec/Archive/Tar/Pack.hs | 9 +++++---- + tar.cabal | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs +index 8e43091..0af6103 100644 +--- a/Codec/Archive/Tar/Pack.hs ++++ b/Codec/Archive/Tar/Pack.hs +@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native + import System.Directory + ( getDirectoryContents, doesDirectoryExist, getModificationTime + , Permissions(..), getPermissions ) +-import System.Time +- ( ClockTime(..) ) ++import Data.Time.Clock.POSIX ++ ( utcTimeToPOSIXSeconds ) + import System.IO + ( IOMode(ReadMode), openBinaryFile, hFileSize ) + import System.IO.Unsafe (unsafeInterleaveIO) +@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do + + getModTime :: FilePath -> IO EpochTime + getModTime path = do +- (TOD s _) <- getModificationTime path +- return $! fromIntegral s ++ utcTime <- getModificationTime path ++ let s = truncate . utcTimeToPOSIXSeconds $ utcTime ++ return $! s +diff --git a/tar.cabal b/tar.cabal +index e748b07..d85b0da 100644 +--- a/tar.cabal ++++ b/tar.cabal +@@ -25,7 +25,7 @@ source-repository head + + library + build-depends: base >= 3 && < 5, filepath, +- directory, old-time, bytestring ++ directory, bytestring, time + + exposed-modules: + Codec.Archive.Tar +-- +1.7.12 + diff --git a/community-staging/haskell-tar/PKGBUILD b/community-staging/haskell-tar/PKGBUILD new file mode 100644 index 000000000..438145b82 --- /dev/null +++ b/community-staging/haskell-tar/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 76085 2012-09-11 06:28:53Z tdziedzic $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> + +pkgname=haskell-tar +pkgver=0.4.0.0 +pkgrel=3 +pkgdesc="Reading, writing and manipulating \".tar\" archive files." +url="http://hackage.haskell.org/package/tar" +license=('custom:BSD3') +arch=('x86_64' 'i686') +depends=('ghc=7.6.1-1') +source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz" + '0001-update-changed-time-code-for-ghc-7.6.1.patch') +install=haskell-tar.install +sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113' + '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6') + +build() { + cd "$srcdir/tar-$pkgver" + + # time functions have changed in ghc 7.6.1 + patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch + + 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/tar-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/tar" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm 644 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-staging/haskell-tar/haskell-tar.install b/community-staging/haskell-tar/haskell-tar.install new file mode 100644 index 000000000..7e0383621 --- /dev/null +++ b/community-staging/haskell-tar/haskell-tar.install @@ -0,0 +1,24 @@ +HS_DIR=usr/share/haskell/haskell-tar + +post_install() { + ${HS_DIR}/register.sh + post_remove +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + post_install +} + +pre_remove() { + pre_upgrade +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-x11-xft/PKGBUILD b/community-staging/haskell-x11-xft/PKGBUILD new file mode 100644 index 000000000..356821274 --- /dev/null +++ b/community-staging/haskell-x11-xft/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 76130 2012-09-11 20:58:01Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +_hkgname=X11-xft +pkgname=haskell-x11-xft +pkgver=0.3.1 +pkgrel=5 +pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" +url="http://hackage.haskell.org/package/${_hkgname}" +license=('LGPL') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft') +options=('strip') +install=haskell-x11-xft.install +source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) +md5sums=('ad885150a59f63de328e73abe5ffc79e') + +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 +} + +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 +} diff --git a/community-staging/haskell-x11-xft/haskell-x11-xft.install b/community-staging/haskell-x11-xft/haskell-x11-xft.install new file mode 100644 index 000000000..a0ff8dac8 --- /dev/null +++ b/community-staging/haskell-x11-xft/haskell-x11-xft.install @@ -0,0 +1,18 @@ +HS_DIR=/usr/share/haskell/haskell-x11-xft +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/haskell-x11/PKGBUILD b/community-staging/haskell-x11/PKGBUILD new file mode 100644 index 000000000..ba44c0a70 --- /dev/null +++ b/community-staging/haskell-x11/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 76125 2012-09-11 19:44:43Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: shild <sxp@bk.ru> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> + +_hkgname=X11 +pkgname=haskell-x11 +pkgver=1.6.0.2 +pkgrel=1 +pkgdesc="A Haskell binding to the X11 graphics library." +arch=(i686 x86_64) +url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" +license=('custom:BSD3') +options=('strip') +depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr') +conflicts=(haskell-x11-extras) +install=hsmod.install +source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) +md5sums=('0227ba7a8788c3cfd146e952a5fafc82') + +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 +} + +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 +} diff --git a/community-staging/haskell-x11/hsmod.install b/community-staging/haskell-x11/hsmod.install new file mode 100644 index 000000000..45c23b979 --- /dev/null +++ b/community-staging/haskell-x11/hsmod.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-x11 +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 8e13c3831..9d0d16132 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74589 2012-07-31 10:03:32Z spupykin $ +# $Id: PKGBUILD 76103 2012-09-11 14:04:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader -pkgver=0.99.1 +pkgver=0.99.2 pkgrel=1 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite') makedepends=('ccache') source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) -md5sums=('af424a825e091bb33b65c04882c0b93a') +md5sums=('a6fce0b759c9cbaddfdd3482a9c148e1') build() { export TARGET_ARCH=desktop diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 62c59c4d0..3a36888a5 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71741 2012-06-02 10:28:48Z bluewind $ +# $Id: PKGBUILD 76105 2012-09-11 14:05:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius -pkgver=2.1.12 -pkgrel=6 +pkgver=2.2.0 +pkgrel=1 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" @@ -17,8 +17,8 @@ install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} radiusd krb5-build-fix.patch) -md5sums=('862d3a2c11011e61890ba84fa636ed8c' - '8759569d36b9f353c281e24875b556be' +md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' + '5dd57af81ba075102581fec45316ba7b' 'f1a6530b1b69d2fa793aa45b2de379bb' 'c6a61de7576933f59154a53bfc12a2d2') diff --git a/community/freeradius/freeradius.install b/community/freeradius/freeradius.install index c3b9f9415..cb7590e77 100644 --- a/community/freeradius/freeradius.install +++ b/community/freeradius/freeradius.install @@ -2,21 +2,16 @@ post_install() { groupadd -r radiusd useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd - touch /var/log/radius/radius.log - chown -R radiusd.radiusd /var/log/radius/radius.log + touch var/log/radius/radius.log + chown -R radiusd:radiusd var/log/radius/radius.log - [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb + [ -d etc/raddb ] || cp -a etc/raddb.default etc/raddb - /bin/true -} - -pre_remove() { - /etc/rc.d/radiusd stop - /bin/true + true } post_remove() { userdel radiusd groupdel radiusd - /bin/true + true } diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index d4e2be246..47d537560 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 74614 2012-07-31 19:55:47Z ebelanger $ +# $Id: PKGBUILD 76107 2012-09-11 14:06:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl -pkgver=1.22.13 -pkgrel=2 +pkgver=1.22.13.1 +_pkgver=1.22.13 +pkgrel=1 pkgdesc="VRML viewer" arch=('i686' 'x86_64' 'mips64el') url="http://freewrl.sourceforge.net/" @@ -14,12 +15,12 @@ depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' ' makedepends=('java-environment' 'xulrunner') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('7e432c7a9eb5d00497d34d93e2b4d420') +md5sums=('27f4bf163011d8ac2088a535cb58a13d') build() { . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_pkgver} export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" ./configure \ @@ -31,6 +32,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_pkgver} make DESTDIR=$pkgdir install } diff --git a/community/gavl/PKGBUILD b/community/gavl/PKGBUILD index 5121835ba..cf531cc3a 100644 --- a/community/gavl/PKGBUILD +++ b/community/gavl/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 66386 2012-02-24 12:23:09Z lfleischer $ +# $Id: PKGBUILD 76134 2012-09-12 03:17:18Z ebelanger $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=gavl -pkgver=1.2.0 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc='A low level library, upon which multimedia APIs can be built.' arch=('i686' 'x86_64' 'mips64el') url='http://gmerlin.sourceforge.net/' license=('GPL') depends=('glibc') -optios=(!libtool) +options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz") -md5sums=('f7dd25d3ef26a8d22f947e9383d251e7') +md5sums=('2752013a817fbc43ddf13552215ec2c0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD index 8ead362b1..7e8be49c9 100644 --- a/community/gnonlin/PKGBUILD +++ b/community/gnonlin/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 66604 2012-02-26 14:12:00Z lfleischer $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 76128 2012-09-11 20:32:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gnonlin pkgver=0.10.16 -pkgrel=2 -pkgdesc="A library for creating non-linear video editors" -arch=('i686' 'x86_64' 'mips64el') -url="http://gnonlin.sourceforge.net" -depends=('gstreamer0.10>=0.10.30') -makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.30' 'pkgconfig') +pkgrel=3 +pkgdesc='Library for creating non-linear video editors' +arch=('x86_64' 'i686' 'mips64el') +url='http://gnonlin.sourceforge.net/' +depends=('gstreamer0.10>=0.10.36') +makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig') options=('!libtool') license=('LGPL') -source=("http://gstreamer.freedesktop.org/src/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('824619ce357c0a61e333c3cc745a63bd') +source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2") +sha256sums=('0d32028d449c304bc8d467d02c053c64988b2fc5bbeb020c13361f9d7206bbf5') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 79bb10afe..74484c70e 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75490 2012-08-26 06:32:00Z bpiotrowski $ +# $Id: PKGBUILD 76119 2012-09-11 16:47:42Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') install=kadu.install source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('1be664676ff0fba0bc246baaaa44a35c') +md5sums=('e546834f85bed14279691998545d203c') build() { cd "$srcdir" diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 77241e0fd..89637e555 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 73729 2012-07-14 18:16:59Z seblu $ +# $Id: PKGBUILD 76132 2012-09-11 21:50:55Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com> pkgname=luaposix -pkgver=5.1.20 -pkgrel=2 +pkgver=5.1.21 +pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64' 'mips64el') url='http://luaforge.net/projects/luaposix/' @@ -14,8 +14,8 @@ license=('GPL' 'LGPL') depends=('lua' 'luabitop') #checkdepends=('lunit') options=('!libtool') -source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('594d67678f829875e33c86b281441843') +source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('7bc06747199f6bd2994ed5a7b2bdf089') build() { cd $pkgname-$pkgver diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 65177aa26..0f59eb835 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75913 2012-09-05 11:10:59Z stativ $ +# $Id: PKGBUILD 76091 2012-09-11 09:36:55Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays -pkgver=1.0rc4 -_pkgver=752ba5c422e0 +pkgver=1.0 +_pkgver=77f43d452539 pkgrel=1 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" @@ -12,7 +12,7 @@ license=('GPL') depends=('freeimage' 'freeglut' 'glew' 'libcl') makedepends=('cmake' 'boost' 'opencl-headers') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('409a6d7b4279709c63cf2f1324d837ef') +md5sums=('04dbda4a999f60a9ec26418bac5243cd') build() { cd "$srcdir/luxrender-$pkgname-$_pkgver" diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 243906b9e..c3211a00e 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75915 2012-09-05 11:28:27Z stativ $ +# $Id: PKGBUILD 76093 2012-09-11 09:48:44Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> pkgname=luxrender -pkgver=1.0rc4 -_pkgver=0b4c3e188707 +pkgver=1.0 +_pkgver=a041e87b9732 pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ boost_1.50_fix.diff) -md5sums=('0578f2500f51363ab4d8ea5004fea9dc' +md5sums=('28228a8ef311aa5e665e7b9d3708b026' '4cddc606ef3ea7f0bbbc9b3415be38b0') build() { diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index bf94c2554..6d7d9549c 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75598 2012-08-27 12:35:39Z bpiotrowski $ +# $Id: PKGBUILD 76117 2012-09-11 15:49:50Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.25 -pkgrel=6 +pkgver=5.5.27 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" @@ -12,7 +12,7 @@ makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz service rc.d tmpfiles.conf) -md5sums=('943f67c267d73a4080ab497e11740daf' +md5sums=('ad6f3239a1d5af0a667e30f7c0b05037' '9e7aa0fa646f48662df569259061fcef' '3bb5a9a96340feb0184bc057ee6e330b' '32f30449d3111714fe190931d08fdb8c') diff --git a/community/python2-numexpr/PKGBUILD b/community/python2-numexpr/PKGBUILD new file mode 100644 index 000000000..6ce7467e1 --- /dev/null +++ b/community/python2-numexpr/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 76098 2012-09-11 10:07:07Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Sebastien Binet <binet@lblbox> + +pkgname=python2-numexpr +pkgver=2.0.1 +pkgrel=1 +pkgdesc="A JIT compiler for Python expressions" +url="http://code.google.com/p/numexpr/" +arch=('i686' 'x86_64') +license=('MIT') +depends=('python2-numpy') +makedepends=('python2-distribute') +provides=('python-numexpr') # temporary compatibility because of rename +source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) +md5sums=('5cdc05c2ef8761daeae8a3182e468ba4') + +build() { + cd "$srcdir"/numexpr-$pkgver + + python2 setup.py build +} + +package() { + cd "$srcdir"/numexpr-$pkgver + + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/python2|" \ + $(find "${pkgdir}" -name '*.py') + + install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community/python2-pytables/PKGBUILD b/community/python2-pytables/PKGBUILD new file mode 100644 index 000000000..082ebc1ba --- /dev/null +++ b/community/python2-pytables/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 76101 2012-09-11 10:23:14Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Sebastien Binet <binet@cern.ch> + +pkgname=python2-pytables +pkgver=2.4.0 +pkgrel=1 +arch=("i686" "x86_64") +pkgdesc="PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" +url="http://www.pytables.org" +license=("BSD") +depends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2') +provides=('python-pytables') # temporary due to package rename +source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz") +md5sums=('527ad046f92c9197ca96626b725f71f8') + +build() { + cd "$srcdir"/tables-${pkgver} + python2 setup.py build +} + +package() { + cd "$srcdir"/tables-${pkgver} + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index 27caac2c7..16c166afb 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 74865 2012-08-07 15:48:23Z tredaelli $ +# $Id: PKGBUILD 76115 2012-09-11 15:43:23Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rorschach <r0rschach@lavabit.com> pkgname=vidalia pkgver=0.2.20 -pkgrel=1 +pkgrel=2 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('qt' 'tor') +depends=('geoip' 'qt' 'tor') makedepends=('cmake') install=vidalia.install source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) @@ -22,7 +22,7 @@ build() { cd "$srcdir" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver + cmake -D CMAKE_INSTALL_PREFIX=/usr -DUSE_GEOIP=1 ../$pkgname-$pkgver make } diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index df7a08afa..9321c6902 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71934 2012-06-03 20:48:28Z spupykin $ +# $Id: PKGBUILD 76111 2012-09-11 14:07:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> pkgname=yagf -pkgver=0.9.1 +pkgver=0.9.2 pkgrel=1 pkgdesc="QT4-based GUI for Cuneiform OCR" arch=(i686 x86_64 'mips64el') @@ -14,10 +14,10 @@ optdepends=('xsane: acquire images from a scanner into YAGF directly') makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) -md5sums=('501946bd993c29b23b54d114727ccafb') +md5sums=('13592e52006d20f71c0094aafb13ed0e') build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-$pkgver" cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release . make make DESTDIR=${pkgdir} install diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD index 7ef27a9bd..6fb801418 100644 --- a/extra/bochs/PKGBUILD +++ b/extra/bochs/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 151161 2012-02-25 06:28:51Z pierre $ +# $Id: PKGBUILD 166567 2012-09-11 23:15:35Z eric $ #Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=bochs -pkgver=2.5.1 +pkgver=2.6 pkgrel=1 pkgdesc="A portable x86 PC emulation software package" arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') url="http://bochs.sourceforge.net/" -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +license=('LGPL') depends=('gcc-libs' 'libxrandr') -md5sums=('4fe5325ec422a7f74dbb0adb52c76bb6') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('7e25e1a4d2f7e0464e8d6381f38741d9') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --without-wx --enable-cpu-level=6 \ - --enable-fpu --enable-3dnow + --enable-fpu --enable-3dnow --enable-disasm make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install - install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 .bochsrc "${pkgdir}/etc/bochsrc-sample.txt" } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 75d055041..64f173e66 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165835 2012-08-31 19:34:55Z giovanni $ +# $Id: PKGBUILD 166562 2012-09-11 07:22:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.08.31 +pkgver=2012.09.11 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('f8d2b0e4809b4dfa97ec2e6b557eb4b4') +md5sums=('2ea74ee10caa15d79f0a2ea3681703f2') build() { cd ${srcdir}/live diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 7f0fb0ddc..58e266a47 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 166317 2012-09-06 01:14:06Z stephane $ +# $Id: PKGBUILD 166564 2012-09-11 14:37:47Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=nasm -pkgver=2.10.04 +pkgver=2.10.05 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" url="http://www.nasm.us" license=('BSD') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') -makedepends=('ghostscript') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d80b5ea8f59a4929efddcb8e90d00b8a0fc00cb5') +sha1sums=('fb9cd57680ed8026c9b612f0db8ecf8df05a1e3c') install=nasm.install build() { cd "${srcdir}/${pkgbase}-${pkgver}" ./configure --prefix=/usr - make everything + make + make -C doc info } package() { diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 2eb2aff55..c41112a07 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=liferea pkgname=liferea-libre pkgver=1.8.8 -pkgrel=1.1 +pkgrel=1.2 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64' 'mips64el') url="http://liferea.sourceforge.net/" diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install index 7d812ccdb..3e1aa5820 100644 --- a/libre/liferea-libre/liferea.install +++ b/libre/liferea-libre/liferea.install @@ -1,7 +1,7 @@ -pkgname=liferea +pkgname=liferea-libre post_install() { - usr/sbin/gconfpkg --install ${pkgname} + usr/sbin/gconfpkg --install ${_pkgname} gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -14,7 +14,7 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + usr/sbin/gconfpkg --uninstall ${_pkgname} } post_remove() { diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD index 8b8a5c7dd..0a63f43d8 100644 --- a/pcr/mesa-git/PKGBUILD +++ b/pcr/mesa-git/PKGBUILD @@ -4,7 +4,7 @@ _d3d1x=false _openvg=true _va=false _vdpau=true -_wayland=false +_wayland=true _xorg=true _xvmc=true pkgbase=mesa-git @@ -24,6 +24,7 @@ true && pkgname=( intel-gallium-dri-git intel-dri-git nouveau-dri-git + svga-dri-git mesa-git ) if [ $_openvg = true ]; then @@ -67,9 +68,10 @@ if [ $_xvmc = true ]; then soft-xvmc-git ) fi -true && pkgver=9.0.0.git20120908 +true && pkgver=9.0.0.git$(LC_ALL=C date -u +%Y%m%d) true && pkgrel=1 _mesaver=9.0 +_dricore=9.1 arch=( i686 x86_64 @@ -205,7 +207,7 @@ build() { --with-clang-libdir=/usr/lib \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \ - --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast + --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast make V=0 } @@ -275,11 +277,12 @@ package_libegl-wayland-git() { fi conflicts=( libegl + libegl-git libegl-wayland ) provides=( libegl=$_mesaver - libegl-git=$_mesaver + libegl-git libegl-wayland=$_mesaver ) pkgdesc='Mesa EGL libraries and headers, with wayland Support' @@ -322,11 +325,12 @@ package_libegl-git() { conflicts=( libegl libegl-wayland + libegl-wayland-git ) provides=( libegl=$_mesaver - libegl-git=$_mesaver libegl-wayland=$_mesaver + libegl-wayland-git ) pkgdesc='Mesa EGL libraries and headers' @@ -397,11 +401,12 @@ package_libgl-gallium-git() { ) conflicts=( libgl + libgl-git libgl-gallium ) provides=( libgl=$_mesaver - libgl-git=$_mesaver + libgl-git libgl-gallium=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer' @@ -415,12 +420,12 @@ package_libgl-gallium-git() { install -m755 -d $pkgdir/usr/lib/xorg/modules/extensions install -m755 -d $pkgdir/usr/share/doc/libgl install -m755 -d $pkgdir/usr/share/licenses/libgl - #ln -s libdricore$_mesaver.so.1.0.0 $pkgdir/usr/lib/libdricore.so + #ln -s libdricore$_dricore.so.1.0.0 $pkgdir/usr/lib/libdricore.so ln -s libglx.xorg $pkgdir/usr/lib/xorg/modules/extensions/libglx.so #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib #install -Dm644 lib/libGL.so* $pkgdir/usr/lib - #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib - #install -Dm644 lib/libdricore$_mesaver.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore$_dricore.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore$_dricore.so* $pkgdir/usr/lib #install -Dm644 lib/gallium/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgl @@ -439,11 +444,12 @@ package_libgl-git() { conflicts=( libgl libgl-gallium + libgl-gallium-git ) provides=( libgl=$_mesaver libgl-gallium=$_mesaver - libgl-gallium-git=$_mesaver + libgl-gallium-git ) pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer' @@ -460,8 +466,8 @@ package_libgl-git() { ln -s libglx.xorg $pkgdir/usr/lib/xorg/modules/extensions/libglx.so #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib #install -Dm644 lib/libGL.so* $pkgdir/usr/lib - #install -Dm644 src/mesa/libdricore/libdricore$_mesaver.la $pkgdir/usr/lib - #install -Dm644 lib/libdricore$_mesaver.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore$_dricore.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore$_dricore.so* $pkgdir/usr/lib #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri #install -Dm644 lib/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl @@ -625,11 +631,12 @@ package_intel-gallium-dri-git() { ) conflicts=( intel-dri + intel-dri-git intel-gallium-dri ) provides=( intel-dri=$_mesaver - intel-dri-git=$_mesaver + intel-dri-git intel-gallium-dri=$_mesaver ) pkgdesc='Mesa DRI drivers for Intel, with i915 Gallium Driver )' @@ -654,6 +661,7 @@ package_intel-dri-git() { conflicts=( intel-dri intel-gallium-dri + intel-gallium-dri-git ) provides=( intel-dri=$_mesaver @@ -703,6 +711,36 @@ package_nouveau-dri-git() { install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-dri } +package_svga-dri-git() { + depends=( + libgl-git + ) + conflicts=( + svga-dri + ) + provides=( + svga-dri=$_mesaver + ) + pkgdesc='Free Gallium3D VMware guest GL driver' + + make -C $srcdir/build/src/gallium/targets/dri-vmwgfx DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xa-vmwgfx DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/include + #install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + install -m755 -d $pkgdir/usr/share/licenses/svga-dri + #install -Dm644 lib/gallium/libxatracker.so* $pkgdir/usr/lib + #install -Dm644 src/gallium/state_trackers/xa/xa_composite.h $pkgdir/usr/lib/include + #install -Dm644 src/gallium/state_trackers/xa/xa_context.h $pkgdir/usr/lib/include + #install -Dm644 src/gallium/state_trackers/xa/xa_tracker.h $pkgdir/usr/lib/include + #install -Dm644 src/gallium/targets/xa-vmwgfx/xatracker.pc $pkgdir/usr/lib/pkgconfig + #install -Dm644 lib/gallium/vmwgfx_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/svga-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/svga-dri +} + package_ati-va-git() { depends=( glibc @@ -974,7 +1012,6 @@ package_mesa-git() { depends=( dri2proto glproto-git - libgl-git libglu-git ) optdepends=( @@ -992,10 +1029,10 @@ package_mesa-git() { cd $srcdir/build make DESTDIR=$pkgdir install - rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h} + rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h,xa_*.h} rm -fvr $pkgdir/usr/lib/{egl,gbm,opencl,vdpau,xorg} - rm -fv $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*} - rm -fv $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc} + rm -fv $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*,libxatracker.so*} + rm -fv $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc,xatracker.pc} install -m755 -d $pkgdir/usr/share/licenses/mesa install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/mesa install -Dm644 docs/license.html $pkgdir/usr/share/licenses/mesa diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index 206651216..d07972e54 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -1,12 +1,14 @@ # Maintainer: Vojtech Aschenbrenner <v@asch.cz> # Contributor: Jason Gardner <buhrietoe@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=zoneminder pkgver=1.25.0 pkgrel=13 pkgdesc="Capture, analyse, record and monitor video security cameras" -arch=('i686' 'x86_64' 'arm') +arch=('i686' 'x86_64' 'mips64el') url="http://www.zoneminder.com" license=('GPL') depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'sudo' 'libv4l' 'libjpeg' 'gnutls' 'php-apache') @@ -84,7 +86,7 @@ build() { # Build it! make || return 1 - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" ZM_RUNDIR="$pkgdir/var/run" ZM_TMPDIR="$pkgdir/tmp" ZM_LOGDIR="$pkgdir/var/log" install || return 1 install -D -m 700 $startdir/src/zminit.arch $startdir/pkg/srv/zoneminder/bin/zminit install -D -m 755 $startdir/src/zm.rc.d $startdir/pkg/etc/rc.d/zm diff --git a/~mtjm/debootstrap/PKGBUILD b/~mtjm/debootstrap/PKGBUILD index 8da48c3a0..20ff27fcb 100644 --- a/~mtjm/debootstrap/PKGBUILD +++ b/~mtjm/debootstrap/PKGBUILD @@ -1,25 +1,26 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=debootstrap -_version=1.0.29 -_ubuntu=1 -_trisquel=5.0 -_trisquelrev=2 +_version=1.0.37 +_ubuntu=0 +_trisquel=5.5 +_trisquelrev=1 pkgver=$_version.$_ubuntu.$_trisquel.$_trisquelrev pkgrel=1 pkgdesc="Bootstrap a basic Trisquel system" arch=('any') -url="http://packages.trisquel.info/source/dagda/debootstrap" +url="http://packages.trisquel.info/source/brigantia/debootstrap" license=('custom') depends=('sh') makedepends=('makedev') backup=() -source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}ubuntu${_ubuntu}+${_trisquel}trisquel${_trisquelrev}.tar.gz") -md5sums=('22f8ddf5e11153c6fae8309a579e3376') +#source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}ubuntu${_ubuntu}+${_trisquel}trisquel${_trisquelrev}.tar.gz") +source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}+${_trisquel}trisquel${_trisquelrev}.tar.gz") +sha256sums=('13ce77c840dc83ce84b52e850275b5ef6371bb72d068663933a2e1eefbd13e1e') package() { cd "$srcdir/source" - sed -i 's;MAKEDEV := /sbin/MAKEDEV;MAKEDEV := /usr/sbin/MAKEDEV;' Makefile # fix Arch compatibility + sed -i 's;MAKEDEV := /sbin/MAKEDEV;MAKEDEV := /usr/sbin/MAKEDEV -d .;' Makefile # fix Arch compatibility sed -i 's; consoleonly;;' Makefile # doesn't work, not sure why make all # not in build, since it needs root priviledges make DESTDIR="$pkgdir/" install |