diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 21:35:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-20 21:35:54 -0300 |
| commit | 19d0c098d66c67860d212786491f5285014a9e09 (patch) | |
| tree | a7bdcaeee20b3fdfd8832c2a93bc749fa96e87f6 | |
| parent | 188f3616b7866423727869599710ab44dff19945 (diff) | |
Removed uneeded files
117 files changed, 0 insertions, 6930 deletions
diff --git a/community-staging/alex/PKGBUILD b/community-staging/alex/PKGBUILD deleted file mode 100644 index eadf607c6..000000000 --- a/community-staging/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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 deleted file mode 100644 index 1c6a7dd65..000000000 --- a/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch +++ /dev/null @@ -1,69 +0,0 @@ -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 deleted file mode 100644 index e0e928514..000000000 --- a/community-staging/gtk2hs-buildtools/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $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 deleted file mode 100644 index 2e687db21..000000000 --- a/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 274cc7851..000000000 --- a/community-staging/haddock/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# 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 deleted file mode 100644 index 24e27a074..000000000 --- a/community-staging/haddock/haddock.install +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 3b45dcd16..000000000 --- a/community-staging/haskell-bytestring-show/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $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 deleted file mode 100644 index 335fc37cd..000000000 --- a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install +++ /dev/null @@ -1,24 +0,0 @@ -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-cairo/PKGBUILD b/community-staging/haskell-cairo/PKGBUILD deleted file mode 100644 index d07e9f435..000000000 --- a/community-staging/haskell-cairo/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 76138 2012-09-12 04:01:58Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-cairo -pkgver=0.12.3.1 -pkgrel=2 -pkgdesc="Binding to the cairo library for Gtk2Hs." -url="http://hackage.haskell.org/package/cairo" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') -makedepends=("gtk2hs-buildtools") -options=('strip') -conflicts=('gtk2hs-cairo') -provides=('gtk2hs-cairo') -replaces=('gtk2hs-cairo') -install=gtk2hs-cairo.install -source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('9d489fbb6cadb3d109543fe25c50195e') - -build() { - cd ${srcdir}/cairo-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \ - --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}/cairo-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-cairo/gtk2hs-cairo.install b/community-staging/haskell-cairo/gtk2hs-cairo.install deleted file mode 100644 index 4ec5096b6..000000000 --- a/community-staging/haskell-cairo/gtk2hs-cairo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-cairo -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-ghc-paths/PKGBUILD b/community-staging/haskell-ghc-paths/PKGBUILD deleted file mode 100644 index 1e23d3c10..000000000 --- a/community-staging/haskell-ghc-paths/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: -# Contributor: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-ghc-paths -pkgver=0.1.0.8 -pkgrel=9 -pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/ghc-paths" -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.6.1-1') -source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") -install=haskell-ghc-paths.install -md5sums=('d2b23dc563888e380588501d2ce1d82b') - -build() { - cd "$srcdir/ghc-paths-$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/ghc-paths-$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/ghc-paths" - runhaskell Setup copy --destdir="$pkgdir" - install -D -m644 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-ghc-paths/haskell-ghc-paths.install b/community-staging/haskell-ghc-paths/haskell-ghc-paths.install deleted file mode 100644 index 4fd2c6c56..000000000 --- a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-paths -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-haskeline/PKGBUILD b/community-staging/haskell-haskeline/PKGBUILD deleted file mode 100644 index fe25fb84a..000000000 --- a/community-staging/haskell-haskeline/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 76055 2012-09-10 05:23:04Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=haskeline -pkgname=haskell-haskeline -pkgver=0.7.0.3 -pkgrel=1 -pkgdesc="A command-line interface for user input, written in Haskell." -url="http://hackage.haskell.org/package/haskeline" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('3a78043dc80b5510202e71e77c0a9923') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure \ - -O -p --enable-split-objs --enable-shared -fterminfo --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-haskeline/haskell-haskeline.install b/community-staging/haskell-haskeline/haskell-haskeline.install deleted file mode 100644 index 27cb4a093..000000000 --- a/community-staging/haskell-haskeline/haskell-haskeline.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-haskeline -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-hslogger/PKGBUILD b/community-staging/haskell-hslogger/PKGBUILD deleted file mode 100644 index a2338816c..000000000 --- a/community-staging/haskell-hslogger/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 76057 2012-09-10 05:31:32Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-hslogger -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Versatile logging framework" -url="http://hackage.haskell.org/package/hslogger" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('e0737887b0df75a3781989c8f6689850') - -build() { - cd ${srcdir}/hslogger-${pkgver} - runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ - --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \ - --enable-library-profiling - 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}/hslogger-${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/hslogger - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-staging/haskell-hslogger/haskell-hslogger.install b/community-staging/haskell-hslogger/haskell-hslogger.install deleted file mode 100644 index 2a0d98ae7..000000000 --- a/community-staging/haskell-hslogger/haskell-hslogger.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hslogger -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-regex-compat/PKGBUILD b/community-staging/haskell-regex-compat/PKGBUILD deleted file mode 100644 index c546442ec..000000000 --- a/community-staging/haskell-regex-compat/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-compat -pkgname=haskell-regex-compat -pkgver=0.95.1 -pkgrel=3 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d0573ab4e2f3de5faa61380b67333320') - -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-regex-compat/haskell-regex-compat.install b/community-staging/haskell-regex-compat/haskell-regex-compat.install deleted file mode 100644 index 898c0bba1..000000000 --- a/community-staging/haskell-regex-compat/haskell-regex-compat.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-compat -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-regex-posix/PKGBUILD b/community-staging/haskell-regex-posix/PKGBUILD deleted file mode 100644 index 3c570e4d1..000000000 --- a/community-staging/haskell-regex-posix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-posix -pkgname=haskell-regex-posix -pkgver=0.95.2 -pkgrel=2 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('1df0f9494aab110c7231f36393285c7c') - -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-regex-posix/haskell-regex-posix.install b/community-staging/haskell-regex-posix/haskell-regex-posix.install deleted file mode 100644 index 2b89fae7b..000000000 --- a/community-staging/haskell-regex-posix/haskell-regex-posix.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-posix -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 deleted file mode 100644 index b8c2264bc..000000000 --- a/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 438145b82..000000000 --- a/community-staging/haskell-tar/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $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 deleted file mode 100644 index 7e0383621..000000000 --- a/community-staging/haskell-tar/haskell-tar.install +++ /dev/null @@ -1,24 +0,0 @@ -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-utf8-string/PKGBUILD b/community-staging/haskell-utf8-string/PKGBUILD deleted file mode 100644 index 0b24a3dc8..000000000 --- a/community-staging/haskell-utf8-string/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 76053 2012-09-10 04:57:10Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=utf8-string -pkgname=haskell-utf8-string -pkgver=0.3.7 -pkgrel=3 -pkgdesc="Support for reading and writing UTF8 Strings" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -md5sums=('50e5c395713e716e0e4a56da73f87ccd') - -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-utf8-string/haskell-utf8-string.install b/community-staging/haskell-utf8-string/haskell-utf8-string.install deleted file mode 100644 index 0f64366b2..000000000 --- a/community-staging/haskell-utf8-string/haskell-utf8-string.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-utf8-string -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-xft/PKGBUILD b/community-staging/haskell-x11-xft/PKGBUILD deleted file mode 100644 index 356821274..000000000 --- a/community-staging/haskell-x11-xft/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $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 deleted file mode 100644 index a0ff8dac8..000000000 --- a/community-staging/haskell-x11-xft/haskell-x11-xft.install +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index ba44c0a70..000000000 --- a/community-staging/haskell-x11/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $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 deleted file mode 100644 index 45c23b979..000000000 --- a/community-staging/haskell-x11/hsmod.install +++ /dev/null @@ -1,18 +0,0 @@ -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-staging/haskell-xhtml/PKGBUILD b/community-staging/haskell-xhtml/PKGBUILD deleted file mode 100644 index 7ccfca159..000000000 --- a/community-staging/haskell-xhtml/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -_hkgname=xhtml -pkgname=haskell-xhtml -pkgver=3000.2.1 -pkgrel=2 -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.1-1' 'sh') -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") -install=$pkgname.install -sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') - -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 -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/$_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-staging/haskell-xhtml/haskell-xhtml.install b/community-staging/haskell-xhtml/haskell-xhtml.install deleted file mode 100644 index d03b8a053..000000000 --- a/community-staging/haskell-xhtml/haskell-xhtml.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xhtml -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -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/pidgin-otr/PKGBUILD b/community-staging/pidgin-otr/PKGBUILD deleted file mode 100644 index df801a787..000000000 --- a/community-staging/pidgin-otr/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 76188 2012-09-13 07:35:32Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Bug <Bug2000@gmail.com> -# Contributor: Marcel Wysocki <maci@satgnu.net> - -pkgname=pidgin-otr -pkgver=4.0.0 -pkgrel=1 -pkgdesc='Off-the-Record Messaging plugin for Pidgin.' -arch=('i686' 'x86_64') -license=('GPL') -url='http://www.cypherpunks.ca/otr/' -depends=('libotr>=4.0.0' 'pidgin' 'perlxml') -makedepends=('intltool') -source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('eadb953376acc474e56041d4c12aa2c8' - '8c70a2fc6f5f0480f32178742ba96498') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD deleted file mode 100644 index c4f67ddbb..000000000 --- a/community-testing/freedroidrpg/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 75738 2012-08-30 16:55:50Z heftig $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: nut543 <kfs1@online.no> - -#pkgbase=freedroidrpg -#pkgname=('freedroidrpg' 'freedroidrpg-data') -pkgname='freedroidrpg' -pkgver=0.15.1 -pkgrel=2 -arch=('i686' 'x86_64') -# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') -depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') -optdepends=('python2' 'espeak') -pkgdesc="a mature science fiction role playing game set in the future" -url="http://freedroid.sourceforge.net" -license=("GPL") -source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidRPG-$pkgver.tar.gz - freedroidrpg.jpg - freedroidrpg.desktop) -md5sums=('b95ea6abae46bea6ee3ace9a1902f682' - 'b73d9dac44c7e83a6c80fbe4eb96ba79' - '9a10c2a2064439cdcff5b945dfb1c3ac') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install - install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg - install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop -} diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop deleted file mode 100644 index 33ee2f5b8..000000000 --- a/community-testing/freedroidrpg/freedroidrpg.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=freedroidrpg -Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG -Exec=freedroidRPG -Encoding=UTF-8 -Icon=/usr/share/icons/freedroidrpg.jpg -Categories=Game;RolePlaying; -Terminal=false -StartupNotify=false diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg Binary files differdeleted file mode 100644 index 4daa89313..000000000 --- a/community-testing/freedroidrpg/freedroidrpg.jpg +++ /dev/null diff --git a/community-testing/girara/PKGBUILD b/community-testing/girara/PKGBUILD deleted file mode 100644 index f9973b8c1..000000000 --- a/community-testing/girara/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 75776 2012-08-31 00:57:20Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: mlq <mlq@pwmt.org> - -pkgbase=girara -pkgname=(girara-common girara-gtk2 girara-gtk3) -pkgver=0.1.4 -pkgrel=1 -pkgdesc="user interface library" -arch=('i686' 'x86_64') -url="http://pwmt.org/projects/girara" -license=('custom') -makedepends=('gtk3' 'gtk2') -source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) -md5sums=('f348fbe96ceda4a89142cec92de08d25') - -build() { - true -} - -package_girara-common() { - depends=() - pkgdesc="user interface library - common files" - - cd "$srcdir/girara-$pkgver" - - make clean - - # install header - make DESTDIR="$pkgdir/" install-headers - - # install language files - make DESTDIR="$pkgdir/" -C po install - - # remove pkgconfig files - rm -r $pkgdir/usr/lib/pkgconfig - - # install license - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_girara-gtk2() { - depends=('gtk2' 'girara-common') - provides=('girara') - - cd "$srcdir/girara-$pkgver" - - make clean - make GIRARA_GTK_VERSION=2 - - # install files - make GIRARA_GTK_VERSION=2 DESTDIR="$pkgdir/" install - - # remove common files - rm -r "$pkgdir/usr/include" - rm -r "$pkgdir/usr/share" - - # install license - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_girara-gtk3() { - depends=('gtk3' 'girara-common') - provides=('girara') - - cd "$srcdir/girara-$pkgver" - - make clean - make GIRARA_GTK_VERSION=3 - - # install files - make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install - - # remove common files - rm -r "$pkgdir/usr/include" - rm -r "$pkgdir/usr/share" - - # install license - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-testing/lincity-ng/PKGBUILD b/community-testing/lincity-ng/PKGBUILD deleted file mode 100644 index 8f6d046ef..000000000 --- a/community-testing/lincity-ng/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 75765 2012-08-30 21:20:22Z lcarlier $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=lincity-ng -pkgver=2.0 -pkgrel=5.1 -pkgdesc="A city simulation game" -arch=('i686' 'x86_64') -url="https://fedorahosted.org/LinCity-NG" -license=('GPL' 'custom') -depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl') -makedepends=('ftjam' 'mesa') -source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - jam -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - jam -sprefix="${pkgdir}/usr" install - install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt" - install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt" -} diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD deleted file mode 100644 index e0af9d0c7..000000000 --- a/community-testing/qtcreator/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 76389 2012-09-17 08:13:07Z svenstaro $ -# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Dan Vratil <progdan@progdansoft.com> -# Contributor: thotypous <matiasΘarchlinux-br·org> -# Contributor: delor <bartekpiech gmail com> - -pkgname="qtcreator" -pkgver=2.6.0beta -_pkgver=2.6.0-beta -pkgrel=1 -pkgdesc='Lightweight, cross-platform integrated development environment' -arch=('i686' 'x86_64') -url='http://qt.nokia.com/products/developer-tools' -license=('LGPL') -depends=('qt') -makedepends=('qt-private-headers' 'git') -options=('docs') -optdepends=('qt-doc: for the integrated Qt documentation' - 'gdb: for the debugger' - 'cmake: for cmake project suppport' - 'openssh-askpass: for ssh support' - 'git: for git support' - 'mercurial: for mercurial support' - 'bzr: for bazaar support' - 'valgrind: for analyze support') -install=qtcreator.install -source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop') -md5sums=('ea7c9a94369b6424e98b442a14145bc9' - 'f1f4680b9838ff0b8f4cf11eb850d662') - -build() { - cd ${srcdir} - - [[ -d build ]] && rm -r build - mkdir build && cd build - - qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro - make -} - -package() { - cd ${srcdir}/build - - make INSTALL_ROOT="${pkgdir}/usr/" install - - install -Dm644 ${srcdir}/qtcreator.desktop \ - ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ - ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT -} diff --git a/community-testing/qtcreator/fix-glsl-shit.patch b/community-testing/qtcreator/fix-glsl-shit.patch deleted file mode 100644 index 4b5e504e1..000000000 --- a/community-testing/qtcreator/fix-glsl-shit.patch +++ /dev/null @@ -1,2376 +0,0 @@ -From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001 -From: Christian Kamm <christian.d.kamm@nokia.com> -Date: Mon, 6 Aug 2012 11:29:55 +0200 -Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop. - -The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... - -Task-number: QTCREATORBUG-7517 -Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 -Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> ---- - src/libs/glsl/glsl.g | 4 +- - src/libs/glsl/glslparser.cpp | 638 +++++++++++++++++++++--------------------- - src/libs/glsl/glslparser.h | 2 +- - 3 files changed, 322 insertions(+), 322 deletions(-) - -diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g -index 67f564c..3c6ae7c 100644 ---- a/src/libs/glsl/glsl.g -+++ b/src/libs/glsl/glsl.g -@@ -456,7 +456,7 @@ private: - #include <iostream> - #include <cstdio> - #include <cassert> --#include <QtCore/QDebug> -+#include <QDebug> - - using namespace GLSL; - -@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken) - - static int tks[] = { - T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, -- T_SEMICOLON, T_COMMA, T_COLON, -+ T_SEMICOLON, T_COLON, T_COMMA, - T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, - T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, - T_WHILE, -diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp -index cf4bbe4..d82096b 100644 ---- a/src/libs/glsl/glslparser.cpp -+++ b/src/libs/glsl/glslparser.cpp -@@ -1,5 +1,5 @@ - --#line 427 "./glsl.g" -+#line 423 "./glsl.g" - - /************************************************************************** - ** -@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken) - - static int tks[] = { - T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, -- T_SEMICOLON, T_COMMA, T_COLON, -+ T_SEMICOLON, T_COLON, T_COMMA, - T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, - T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, - T_WHILE, -@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken) - return 0; - } - --#line 647 "./glsl.g" -+#line 641 "./glsl.g" - - void Parser::reduce(int ruleno) - { - switch(ruleno) { - --#line 656 "./glsl.g" -+#line 650 "./glsl.g" - - case 0: { - ast(1) = makeAstNode<IdentifierExpressionAST>(string(1)); - } break; - --#line 663 "./glsl.g" -+#line 657 "./glsl.g" - - case 1: { - ast(1) = makeAstNode<LiteralExpressionAST>(string(1)); - } break; - --#line 670 "./glsl.g" -+#line 664 "./glsl.g" - - case 2: { - ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4)); - } break; - --#line 677 "./glsl.g" -+#line 671 "./glsl.g" - - case 3: { - ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5)); - } break; - --#line 684 "./glsl.g" -+#line 678 "./glsl.g" - - case 4: { - // nothing to do. - } break; - --#line 691 "./glsl.g" -+#line 685 "./glsl.g" - - case 5: { - ast(1) = ast(2); - } break; - --#line 698 "./glsl.g" -+#line 692 "./glsl.g" - - case 6: { - // nothing to do. - } break; - --#line 705 "./glsl.g" -+#line 699 "./glsl.g" - - case 7: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3)); - } break; - --#line 712 "./glsl.g" -+#line 706 "./glsl.g" - - case 8: { - // nothing to do. - } break; - --#line 719 "./glsl.g" -+#line 713 "./glsl.g" - - case 9: { - ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3)); - } break; - --#line 726 "./glsl.g" -+#line 720 "./glsl.g" - - case 10: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1)); - } break; - --#line 733 "./glsl.g" -+#line 727 "./glsl.g" - - case 11: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1)); - } break; - --#line 740 "./glsl.g" -+#line 734 "./glsl.g" - - case 12: { - // nothing to do. - } break; - --#line 747 "./glsl.g" -+#line 741 "./glsl.g" - - case 13: { - // nothing to do. - } break; - --#line 754 "./glsl.g" -+#line 748 "./glsl.g" - - case 14: { - ast(1) = makeAstNode<FunctionCallExpressionAST> - (sym(1).function.id, sym(1).function.arguments); - } break; - --#line 762 "./glsl.g" -+#line 756 "./glsl.g" - - case 15: { - ast(1) = makeAstNode<FunctionCallExpressionAST> - (expression(1), sym(3).function.id, sym(3).function.arguments); - } break; - --#line 770 "./glsl.g" -+#line 764 "./glsl.g" - - case 16: { - // nothing to do. - } break; - --#line 777 "./glsl.g" -+#line 771 "./glsl.g" - - case 17: { - // nothing to do. - } break; - --#line 784 "./glsl.g" -+#line 778 "./glsl.g" - - case 18: { - sym(1).function.id = sym(1).function_identifier; - sym(1).function.arguments = 0; - } break; - --#line 792 "./glsl.g" -+#line 786 "./glsl.g" - - case 19: { - sym(1).function.id = sym(1).function_identifier; - sym(1).function.arguments = 0; - } break; - --#line 800 "./glsl.g" -+#line 794 "./glsl.g" - - case 20: { - sym(1).function.id = sym(1).function_identifier; -@@ -353,7 +353,7 @@ case 20: { - makeAstNode< List<ExpressionAST *> >(expression(2)); - } break; - --#line 809 "./glsl.g" -+#line 803 "./glsl.g" - - case 21: { - sym(1).function.arguments = -@@ -361,379 +361,379 @@ case 21: { - (sym(1).function.arguments, expression(3)); - } break; - --#line 818 "./glsl.g" -+#line 812 "./glsl.g" - - case 22: { - // nothing to do. - } break; - --#line 825 "./glsl.g" -+#line 819 "./glsl.g" - - case 23: { - ast(1) = makeAstNode<FunctionIdentifierAST>(type(1)); - } break; - --#line 832 "./glsl.g" -+#line 826 "./glsl.g" - - case 24: { - ast(1) = makeAstNode<FunctionIdentifierAST>(string(1)); - } break; - --#line 839 "./glsl.g" -+#line 833 "./glsl.g" - - case 25: { - // nothing to do. - } break; - --#line 846 "./glsl.g" -+#line 840 "./glsl.g" - - case 26: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2)); - } break; - --#line 853 "./glsl.g" -+#line 847 "./glsl.g" - - case 27: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2)); - } break; - --#line 860 "./glsl.g" -+#line 854 "./glsl.g" - - case 28: { - ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2)); - } break; - --#line 867 "./glsl.g" -+#line 861 "./glsl.g" - - case 29: { - sym(1).kind = AST::Kind_UnaryPlus; - } break; - --#line 874 "./glsl.g" -+#line 868 "./glsl.g" - - case 30: { - sym(1).kind = AST::Kind_UnaryMinus; - } break; - --#line 881 "./glsl.g" -+#line 875 "./glsl.g" - - case 31: { - sym(1).kind = AST::Kind_LogicalNot; - } break; - --#line 888 "./glsl.g" -+#line 882 "./glsl.g" - - case 32: { - sym(1).kind = AST::Kind_BitwiseNot; - } break; - --#line 895 "./glsl.g" -+#line 889 "./glsl.g" - - case 33: { - // nothing to do. - } break; - --#line 902 "./glsl.g" -+#line 896 "./glsl.g" - - case 34: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3)); - } break; - --#line 909 "./glsl.g" -+#line 903 "./glsl.g" - - case 35: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3)); - } break; - --#line 916 "./glsl.g" -+#line 910 "./glsl.g" - - case 36: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3)); - } break; - --#line 923 "./glsl.g" -+#line 917 "./glsl.g" - - case 37: { - // nothing to do. - } break; - --#line 930 "./glsl.g" -+#line 924 "./glsl.g" - - case 38: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3)); - } break; - --#line 937 "./glsl.g" -+#line 931 "./glsl.g" - - case 39: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3)); - } break; - --#line 944 "./glsl.g" -+#line 938 "./glsl.g" - - case 40: { - // nothing to do. - } break; - --#line 951 "./glsl.g" -+#line 945 "./glsl.g" - - case 41: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3)); - } break; - --#line 958 "./glsl.g" -+#line 952 "./glsl.g" - - case 42: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3)); - } break; - --#line 965 "./glsl.g" -+#line 959 "./glsl.g" - - case 43: { - // nothing to do. - } break; - --#line 972 "./glsl.g" -+#line 966 "./glsl.g" - - case 44: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3)); - } break; - --#line 979 "./glsl.g" -+#line 973 "./glsl.g" - - case 45: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3)); - } break; - --#line 986 "./glsl.g" -+#line 980 "./glsl.g" - - case 46: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3)); - } break; - --#line 993 "./glsl.g" -+#line 987 "./glsl.g" - - case 47: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3)); - } break; - --#line 1000 "./glsl.g" -+#line 994 "./glsl.g" - - case 48: { - // nothing to do. - } break; - --#line 1007 "./glsl.g" -+#line 1001 "./glsl.g" - - case 49: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3)); - } break; - --#line 1014 "./glsl.g" -+#line 1008 "./glsl.g" - - case 50: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3)); - } break; - --#line 1021 "./glsl.g" -+#line 1015 "./glsl.g" - - case 51: { - // nothing to do. - } break; - --#line 1028 "./glsl.g" -+#line 1022 "./glsl.g" - - case 52: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3)); - } break; - --#line 1035 "./glsl.g" -+#line 1029 "./glsl.g" - - case 53: { - // nothing to do. - } break; - --#line 1042 "./glsl.g" -+#line 1036 "./glsl.g" - - case 54: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3)); - } break; - --#line 1049 "./glsl.g" -+#line 1043 "./glsl.g" - - case 55: { - // nothing to do. - } break; - --#line 1056 "./glsl.g" -+#line 1050 "./glsl.g" - - case 56: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3)); - } break; - --#line 1063 "./glsl.g" -+#line 1057 "./glsl.g" - - case 57: { - // nothing to do. - } break; - --#line 1070 "./glsl.g" -+#line 1064 "./glsl.g" - - case 58: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3)); - } break; - --#line 1077 "./glsl.g" -+#line 1071 "./glsl.g" - - case 59: { - // nothing to do. - } break; - --#line 1084 "./glsl.g" -+#line 1078 "./glsl.g" - - case 60: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3)); - } break; - --#line 1091 "./glsl.g" -+#line 1085 "./glsl.g" - - case 61: { - // nothing to do. - } break; - --#line 1098 "./glsl.g" -+#line 1092 "./glsl.g" - - case 62: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3)); - } break; - --#line 1105 "./glsl.g" -+#line 1099 "./glsl.g" - - case 63: { - // nothing to do. - } break; - --#line 1112 "./glsl.g" -+#line 1106 "./glsl.g" - - case 64: { - ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5)); - } break; - --#line 1119 "./glsl.g" -+#line 1113 "./glsl.g" - - case 65: { - // nothing to do. - } break; - --#line 1126 "./glsl.g" -+#line 1120 "./glsl.g" - - case 66: { - ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3)); - } break; - --#line 1133 "./glsl.g" -+#line 1127 "./glsl.g" - - case 67: { - sym(1).kind = AST::Kind_Assign; - } break; - --#line 1140 "./glsl.g" -+#line 1134 "./glsl.g" - - case 68: { - sym(1).kind = AST::Kind_AssignMultiply; - } break; - --#line 1147 "./glsl.g" -+#line 1141 "./glsl.g" - - case 69: { - sym(1).kind = AST::Kind_AssignDivide; - } break; - --#line 1154 "./glsl.g" -+#line 1148 "./glsl.g" - - case 70: { - sym(1).kind = AST::Kind_AssignModulus; - } break; - --#line 1161 "./glsl.g" -+#line 1155 "./glsl.g" - - case 71: { - sym(1).kind = AST::Kind_AssignPlus; - } break; - --#line 1168 "./glsl.g" -+#line 1162 "./glsl.g" - - case 72: { - sym(1).kind = AST::Kind_AssignMinus; - } break; - --#line 1175 "./glsl.g" -+#line 1169 "./glsl.g" - - case 73: { - sym(1).kind = AST::Kind_AssignShiftLeft; - } break; - --#line 1182 "./glsl.g" -+#line 1176 "./glsl.g" - - case 74: { - sym(1).kind = AST::Kind_AssignShiftRight; - } break; - --#line 1189 "./glsl.g" -+#line 1183 "./glsl.g" - - case 75: { - sym(1).kind = AST::Kind_AssignAnd; - } break; - --#line 1196 "./glsl.g" -+#line 1190 "./glsl.g" - - case 76: { - sym(1).kind = AST::Kind_AssignXor; - } break; - --#line 1203 "./glsl.g" -+#line 1197 "./glsl.g" - - case 77: { - sym(1).kind = AST::Kind_AssignOr; - } break; - --#line 1210 "./glsl.g" -+#line 1204 "./glsl.g" - - case 78: { - // nothing to do. - } break; - --#line 1217 "./glsl.g" -+#line 1211 "./glsl.g" - - case 79: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3)); - } break; - --#line 1224 "./glsl.g" -+#line 1218 "./glsl.g" - - case 80: { - // nothing to do. - } break; - --#line 1231 "./glsl.g" -+#line 1225 "./glsl.g" - - case 81: { - // nothing to do. - } break; - --#line 1238 "./glsl.g" -+#line 1232 "./glsl.g" - - case 82: { - ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list); - } break; - --#line 1245 "./glsl.g" -+#line 1239 "./glsl.g" - - case 83: { - ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3)); - } break; - --#line 1252 "./glsl.g" -+#line 1246 "./glsl.g" - - case 84: { - if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) { -@@ -743,7 +743,7 @@ case 84: { - ast(1) = makeAstNode<TypeDeclarationAST>(type); - } break; - --#line 1263 "./glsl.g" -+#line 1257 "./glsl.g" - - case 85: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -761,7 +761,7 @@ case 85: { - makeAstNode<VariableDeclarationAST>(qualtype, string(6))); - } break; - --#line 1282 "./glsl.g" -+#line 1276 "./glsl.g" - - case 86: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -780,7 +780,7 @@ case 86: { - (makeAstNode<ArrayTypeAST>(qualtype), string(6))); - } break; - --#line 1302 "./glsl.g" -+#line 1296 "./glsl.g" - - case 87: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -799,7 +799,7 @@ case 87: { - (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6))); - } break; - --#line 1322 "./glsl.g" -+#line 1316 "./glsl.g" - - case 88: { - TypeAST *type = makeAstNode<QualifiedTypeAST> -@@ -808,59 +808,59 @@ case 88: { - ast(1) = makeAstNode<TypeDeclarationAST>(type); - } break; - --#line 1332 "./glsl.g" -+#line 1326 "./glsl.g" - - case 89: { - function(1)->finishParams(); - } break; - --#line 1339 "./glsl.g" -+#line 1333 "./glsl.g" - - case 90: { - // nothing to do. - } break; - --#line 1346 "./glsl.g" -+#line 1340 "./glsl.g" - - case 91: { - // nothing to do. - } break; - --#line 1353 "./glsl.g" -+#line 1347 "./glsl.g" - - case 92: { - function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > - (sym(2).param_declaration); - } break; - --#line 1361 "./glsl.g" -+#line 1355 "./glsl.g" - - case 93: { - function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > - (function(1)->params, sym(3).param_declaration); - } break; - --#line 1369 "./glsl.g" -+#line 1363 "./glsl.g" - - case 94: { - function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2)); - } break; - --#line 1376 "./glsl.g" -+#line 1370 "./glsl.g" - - case 95: { - sym(1).param_declarator.type = type(1); - sym(1).param_declarator.name = string(2); - } break; - --#line 1384 "./glsl.g" -+#line 1378 "./glsl.g" - - case 96: { - sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4)); - sym(1).param_declarator.name = string(2); - } break; - --#line 1392 "./glsl.g" -+#line 1386 "./glsl.g" - - case 97: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -871,7 +871,7 @@ case 97: { - sym(3).param_declarator.name); - } break; - --#line 1404 "./glsl.g" -+#line 1398 "./glsl.g" - - case 98: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -880,7 +880,7 @@ case 98: { - sym(2).param_declarator.name); - } break; - --#line 1414 "./glsl.g" -+#line 1408 "./glsl.g" - - case 99: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -890,7 +890,7 @@ case 99: { - (const QString *)0); - } break; - --#line 1425 "./glsl.g" -+#line 1419 "./glsl.g" - - case 100: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -898,44 +898,44 @@ case 100: { - (const QString *)0); - } break; - --#line 1434 "./glsl.g" -+#line 1428 "./glsl.g" - - case 101: { - sym(1).qualifier = ParameterDeclarationAST::In; - } break; - --#line 1441 "./glsl.g" -+#line 1435 "./glsl.g" - - case 102: { - sym(1).qualifier = ParameterDeclarationAST::In; - } break; - --#line 1448 "./glsl.g" -+#line 1442 "./glsl.g" - - case 103: { - sym(1).qualifier = ParameterDeclarationAST::Out; - } break; - --#line 1455 "./glsl.g" -+#line 1449 "./glsl.g" - - case 104: { - sym(1).qualifier = ParameterDeclarationAST::InOut; - } break; - --#line 1462 "./glsl.g" -+#line 1456 "./glsl.g" - - case 105: { - // nothing to do. - } break; - --#line 1469 "./glsl.g" -+#line 1463 "./glsl.g" - - case 106: { - sym(1).declaration_list = makeAstNode< List<DeclarationAST *> > - (sym(1).declaration); - } break; - --#line 1477 "./glsl.g" -+#line 1471 "./glsl.g" - - case 107: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -944,7 +944,7 @@ case 107: { - (sym(1).declaration_list, decl); - } break; - --#line 1487 "./glsl.g" -+#line 1481 "./glsl.g" - - case 108: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -954,7 +954,7 @@ case 108: { - (sym(1).declaration_list, decl); - } break; - --#line 1498 "./glsl.g" -+#line 1492 "./glsl.g" - - case 109: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -964,7 +964,7 @@ case 109: { - (sym(1).declaration_list, decl); - } break; - --#line 1509 "./glsl.g" -+#line 1503 "./glsl.g" - - case 110: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -975,7 +975,7 @@ case 110: { - (sym(1).declaration_list, decl); - } break; - --#line 1521 "./glsl.g" -+#line 1515 "./glsl.g" - - case 111: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -986,7 +986,7 @@ case 111: { - (sym(1).declaration_list, decl); - } break; - --#line 1533 "./glsl.g" -+#line 1527 "./glsl.g" - - case 112: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -996,40 +996,40 @@ case 112: { - (sym(1).declaration_list, decl); - } break; - --#line 1544 "./glsl.g" -+#line 1538 "./glsl.g" - - case 113: { - ast(1) = makeAstNode<TypeDeclarationAST>(type(1)); - } break; - --#line 1551 "./glsl.g" -+#line 1545 "./glsl.g" - - case 114: { - ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2)); - } break; - --#line 1558 "./glsl.g" -+#line 1552 "./glsl.g" - - case 115: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1)), string(2)); - } break; - --#line 1566 "./glsl.g" -+#line 1560 "./glsl.g" - - case 116: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2)); - } break; - --#line 1574 "./glsl.g" -+#line 1568 "./glsl.g" - - case 117: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6)); - } break; - --#line 1582 "./glsl.g" -+#line 1576 "./glsl.g" - - case 118: { - ast(1) = makeAstNode<VariableDeclarationAST> -@@ -1037,26 +1037,26 @@ case 118: { - string(2), expression(7)); - } break; - --#line 1591 "./glsl.g" -+#line 1585 "./glsl.g" - - case 119: { - ast(1) = makeAstNode<VariableDeclarationAST> - (type(1), string(2), expression(4)); - } break; - --#line 1599 "./glsl.g" -+#line 1593 "./glsl.g" - - case 120: { - ast(1) = makeAstNode<InvariantDeclarationAST>(string(2)); - } break; - --#line 1606 "./glsl.g" -+#line 1600 "./glsl.g" - - case 121: { - ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0); - } break; - --#line 1613 "./glsl.g" -+#line 1607 "./glsl.g" - - case 122: { - ast(1) = makeAstNode<QualifiedTypeAST> -@@ -1064,207 +1064,207 @@ case 122: { - sym(1).type_qualifier.layout_list); - } break; - --#line 1622 "./glsl.g" -+#line 1616 "./glsl.g" - - case 123: { - sym(1).qualifier = QualifiedTypeAST::Invariant; - } break; - --#line 1629 "./glsl.g" -+#line 1623 "./glsl.g" - - case 124: { - sym(1).qualifier = QualifiedTypeAST::Smooth; - } break; - --#line 1636 "./glsl.g" -+#line 1630 "./glsl.g" - - case 125: { - sym(1).qualifier = QualifiedTypeAST::Flat; - } break; - --#line 1643 "./glsl.g" -+#line 1637 "./glsl.g" - - case 126: { - sym(1).qualifier = QualifiedTypeAST::NoPerspective; - } break; - --#line 1650 "./glsl.g" -+#line 1644 "./glsl.g" - - case 127: { - sym(1) = sym(3); - } break; - --#line 1657 "./glsl.g" -+#line 1651 "./glsl.g" - - case 128: { - sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout); - } break; - --#line 1664 "./glsl.g" -+#line 1658 "./glsl.g" - - case 129: { - sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout); - } break; - --#line 1671 "./glsl.g" -+#line 1665 "./glsl.g" - - case 130: { - sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0); - } break; - --#line 1678 "./glsl.g" -+#line 1672 "./glsl.g" - - case 131: { - sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3)); - } break; - --#line 1685 "./glsl.g" -+#line 1679 "./glsl.g" - - case 132: { - sym(1).qualifier = QualifiedTypeAST::Const; - } break; - --#line 1692 "./glsl.g" -+#line 1686 "./glsl.g" - - case 133: { - sym(1).type_qualifier.qualifier = sym(1).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1700 "./glsl.g" -+#line 1694 "./glsl.g" - - case 134: { - sym(1).type_qualifier.layout_list = sym(1).layout_list; - sym(1).type_qualifier.qualifier = 0; - } break; - --#line 1708 "./glsl.g" -+#line 1702 "./glsl.g" - - case 135: { - sym(1).type_qualifier.layout_list = sym(1).layout_list; - sym(1).type_qualifier.qualifier = sym(2).qualifier; - } break; - --#line 1716 "./glsl.g" -+#line 1710 "./glsl.g" - - case 136: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1724 "./glsl.g" -+#line 1718 "./glsl.g" - - case 137: { - sym(1).type_qualifier.qualifier = sym(1).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1732 "./glsl.g" -+#line 1726 "./glsl.g" - - case 138: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1740 "./glsl.g" -+#line 1734 "./glsl.g" - - case 139: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1748 "./glsl.g" -+#line 1742 "./glsl.g" - - case 140: { - sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1756 "./glsl.g" -+#line 1750 "./glsl.g" - - case 141: { - sym(1).qualifier = QualifiedTypeAST::Const; - } break; - --#line 1763 "./glsl.g" -+#line 1757 "./glsl.g" - - case 142: { - sym(1).qualifier = QualifiedTypeAST::Attribute; - } break; - --#line 1770 "./glsl.g" -+#line 1764 "./glsl.g" - - case 143: { - sym(1).qualifier = QualifiedTypeAST::Varying; - } break; - --#line 1777 "./glsl.g" -+#line 1771 "./glsl.g" - - case 144: { - sym(1).qualifier = QualifiedTypeAST::CentroidVarying; - } break; - --#line 1784 "./glsl.g" -+#line 1778 "./glsl.g" - - case 145: { - sym(1).qualifier = QualifiedTypeAST::In; - } break; - --#line 1791 "./glsl.g" -+#line 1785 "./glsl.g" - - case 146: { - sym(1).qualifier = QualifiedTypeAST::Out; - } break; - --#line 1798 "./glsl.g" -+#line 1792 "./glsl.g" - - case 147: { - sym(1).qualifier = QualifiedTypeAST::CentroidIn; - } break; - --#line 1805 "./glsl.g" -+#line 1799 "./glsl.g" - - case 148: { - sym(1).qualifier = QualifiedTypeAST::CentroidOut; - } break; - --#line 1812 "./glsl.g" -+#line 1806 "./glsl.g" - - case 149: { - sym(1).qualifier = QualifiedTypeAST::PatchIn; - } break; - --#line 1819 "./glsl.g" -+#line 1813 "./glsl.g" - - case 150: { - sym(1).qualifier = QualifiedTypeAST::PatchOut; - } break; - --#line 1826 "./glsl.g" -+#line 1820 "./glsl.g" - - case 151: { - sym(1).qualifier = QualifiedTypeAST::SampleIn; - } break; - --#line 1833 "./glsl.g" -+#line 1827 "./glsl.g" - - case 152: { - sym(1).qualifier = QualifiedTypeAST::SampleOut; - } break; - --#line 1840 "./glsl.g" -+#line 1834 "./glsl.g" - - case 153: { - sym(1).qualifier = QualifiedTypeAST::Uniform; - } break; - --#line 1847 "./glsl.g" -+#line 1841 "./glsl.g" - - case 154: { - // nothing to do. - } break; - --#line 1854 "./glsl.g" -+#line 1848 "./glsl.g" - - case 155: { - if (!type(2)->setPrecision(sym(1).precision)) { -@@ -1273,595 +1273,595 @@ case 155: { - ast(1) = type(2); - } break; - --#line 1864 "./glsl.g" -+#line 1858 "./glsl.g" - - case 156: { - // nothing to do. - } break; - --#line 1871 "./glsl.g" -+#line 1865 "./glsl.g" - - case 157: { - ast(1) = makeAstNode<ArrayTypeAST>(type(1)); - } break; - --#line 1878 "./glsl.g" -+#line 1872 "./glsl.g" - - case 158: { - ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3)); - } break; - --#line 1885 "./glsl.g" -+#line 1879 "./glsl.g" - - case 159: { - ast(1) = makeBasicType(T_VOID); - } break; - --#line 1892 "./glsl.g" -+#line 1886 "./glsl.g" - - case 160: { - ast(1) = makeBasicType(T_FLOAT); - } break; - --#line 1899 "./glsl.g" -+#line 1893 "./glsl.g" - - case 161: { - ast(1) = makeBasicType(T_DOUBLE); - } break; - --#line 1906 "./glsl.g" -+#line 1900 "./glsl.g" - - case 162: { - ast(1) = makeBasicType(T_INT); - } break; - --#line 1913 "./glsl.g" -+#line 1907 "./glsl.g" - - case 163: { - ast(1) = makeBasicType(T_UINT); - } break; - --#line 1920 "./glsl.g" -+#line 1914 "./glsl.g" - - case 164: { - ast(1) = makeBasicType(T_BOOL); - } break; - --#line 1927 "./glsl.g" -+#line 1921 "./glsl.g" - - case 165: { - ast(1) = makeBasicType(T_VEC2); - } break; - --#line 1934 "./glsl.g" -+#line 1928 "./glsl.g" - - case 166: { - ast(1) = makeBasicType(T_VEC3); - } break; - --#line 1941 "./glsl.g" -+#line 1935 "./glsl.g" - - case 167: { - ast(1) = makeBasicType(T_VEC4); - } break; - --#line 1948 "./glsl.g" -+#line 1942 "./glsl.g" - - case 168: { - ast(1) = makeBasicType(T_DVEC2); - } break; - --#line 1955 "./glsl.g" -+#line 1949 "./glsl.g" - - case 169: { - ast(1) = makeBasicType(T_DVEC3); - } break; - --#line 1962 "./glsl.g" -+#line 1956 "./glsl.g" - - case 170: { - ast(1) = makeBasicType(T_DVEC4); - } break; - --#line 1969 "./glsl.g" -+#line 1963 "./glsl.g" - - case 171: { - ast(1) = makeBasicType(T_BVEC2); - } break; - --#line 1976 "./glsl.g" -+#line 1970 "./glsl.g" - - case 172: { - ast(1) = makeBasicType(T_BVEC3); - } break; - --#line 1983 "./glsl.g" -+#line 1977 "./glsl.g" - - case 173: { - ast(1) = makeBasicType(T_BVEC4); - } break; - --#line 1990 "./glsl.g" -+#line 1984 "./glsl.g" - - case 174: { - ast(1) = makeBasicType(T_IVEC2); - } break; - --#line 1997 "./glsl.g" -+#line 1991 "./glsl.g" - - case 175: { - ast(1) = makeBasicType(T_IVEC3); - } break; - --#line 2004 "./glsl.g" -+#line 1998 "./glsl.g" - - case 176: { - ast(1) = makeBasicType(T_IVEC4); - } break; - --#line 2011 "./glsl.g" -+#line 2005 "./glsl.g" - - case 177: { - ast(1) = makeBasicType(T_UVEC2); - } break; - --#line 2018 "./glsl.g" -+#line 2012 "./glsl.g" - - case 178: { - ast(1) = makeBasicType(T_UVEC3); - } break; - --#line 2025 "./glsl.g" -+#line 2019 "./glsl.g" - - case 179: { - ast(1) = makeBasicType(T_UVEC4); - } break; - --#line 2032 "./glsl.g" -+#line 2026 "./glsl.g" - - case 180: { - ast(1) = makeBasicType(T_MAT2); - } break; - --#line 2039 "./glsl.g" -+#line 2033 "./glsl.g" - - case 181: { - ast(1) = makeBasicType(T_MAT3); - } break; - --#line 2046 "./glsl.g" -+#line 2040 "./glsl.g" - - case 182: { - ast(1) = makeBasicType(T_MAT4); - } break; - --#line 2053 "./glsl.g" -+#line 2047 "./glsl.g" - - case 183: { - ast(1) = makeBasicType(T_MAT2); - } break; - --#line 2060 "./glsl.g" -+#line 2054 "./glsl.g" - - case 184: { - ast(1) = makeBasicType(T_MAT2X3); - } break; - --#line 2067 "./glsl.g" -+#line 2061 "./glsl.g" - - case 185: { - ast(1) = makeBasicType(T_MAT2X4); - } break; - --#line 2074 "./glsl.g" -+#line 2068 "./glsl.g" - - case 186: { - ast(1) = makeBasicType(T_MAT3X2); - } break; - --#line 2081 "./glsl.g" -+#line 2075 "./glsl.g" - - case 187: { - ast(1) = makeBasicType(T_MAT3); - } break; - --#line 2088 "./glsl.g" -+#line 2082 "./glsl.g" - - case 188: { - ast(1) = makeBasicType(T_MAT3X4); - } break; - --#line 2095 "./glsl.g" -+#line 2089 "./glsl.g" - - case 189: { - ast(1) = makeBasicType(T_MAT4X2); - } break; - --#line 2102 "./glsl.g" -+#line 2096 "./glsl.g" - - case 190: { - ast(1) = makeBasicType(T_MAT4X3); - } break; - --#line 2109 "./glsl.g" -+#line 2103 "./glsl.g" - - case 191: { - ast(1) = makeBasicType(T_MAT4); - } break; - --#line 2116 "./glsl.g" -+#line 2110 "./glsl.g" - - case 192: { - ast(1) = makeBasicType(T_DMAT2); - } break; - --#line 2123 "./glsl.g" -+#line 2117 "./glsl.g" - - case 193: { - ast(1) = makeBasicType(T_DMAT3); - } break; - --#line 2130 "./glsl.g" -+#line 2124 "./glsl.g" - - case 194: { - ast(1) = makeBasicType(T_DMAT4); - } break; - --#line 2137 "./glsl.g" -+#line 2131 "./glsl.g" - - case 195: { - ast(1) = makeBasicType(T_DMAT2); - } break; - --#line 2144 "./glsl.g" -+#line 2138 "./glsl.g" - - case 196: { - ast(1) = makeBasicType(T_DMAT2X3); - } break; - --#line 2151 "./glsl.g" -+#line 2145 "./glsl.g" - - case 197: { - ast(1) = makeBasicType(T_DMAT2X4); - } break; - --#line 2158 "./glsl.g" -+#line 2152 "./glsl.g" - - case 198: { - ast(1) = makeBasicType(T_DMAT3X2); - } break; - --#line 2165 "./glsl.g" -+#line 2159 "./glsl.g" - - case 199: { - ast(1) = makeBasicType(T_DMAT3); - } break; - --#line 2172 "./glsl.g" -+#line 2166 "./glsl.g" - - case 200: { - ast(1) = makeBasicType(T_DMAT3X4); - } break; - --#line 2179 "./glsl.g" -+#line 2173 "./glsl.g" - - case 201: { - ast(1) = makeBasicType(T_DMAT4X2); - } break; - --#line 2186 "./glsl.g" -+#line 2180 "./glsl.g" - - case 202: { - ast(1) = makeBasicType(T_DMAT4X3); - } break; - --#line 2193 "./glsl.g" -+#line 2187 "./glsl.g" - - case 203: { - ast(1) = makeBasicType(T_DMAT4); - } break; - --#line 2200 "./glsl.g" -+#line 2194 "./glsl.g" - - case 204: { - ast(1) = makeBasicType(T_SAMPLER1D); - } break; - --#line 2207 "./glsl.g" -+#line 2201 "./glsl.g" - - case 205: { - ast(1) = makeBasicType(T_SAMPLER2D); - } break; - --#line 2214 "./glsl.g" -+#line 2208 "./glsl.g" - - case 206: { - ast(1) = makeBasicType(T_SAMPLER3D); - } break; - --#line 2221 "./glsl.g" -+#line 2215 "./glsl.g" - - case 207: { - ast(1) = makeBasicType(T_SAMPLERCUBE); - } break; - --#line 2228 "./glsl.g" -+#line 2222 "./glsl.g" - - case 208: { - ast(1) = makeBasicType(T_SAMPLER1DSHADOW); - } break; - --#line 2235 "./glsl.g" -+#line 2229 "./glsl.g" - - case 209: { - ast(1) = makeBasicType(T_SAMPLER2DSHADOW); - } break; - --#line 2242 "./glsl.g" -+#line 2236 "./glsl.g" - - case 210: { - ast(1) = makeBasicType(T_SAMPLERCUBESHADOW); - } break; - --#line 2249 "./glsl.g" -+#line 2243 "./glsl.g" - - case 211: { - ast(1) = makeBasicType(T_SAMPLER1DARRAY); - } break; - --#line 2256 "./glsl.g" -+#line 2250 "./glsl.g" - - case 212: { - ast(1) = makeBasicType(T_SAMPLER2DARRAY); - } break; - --#line 2263 "./glsl.g" -+#line 2257 "./glsl.g" - - case 213: { - ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW); - } break; - --#line 2270 "./glsl.g" -+#line 2264 "./glsl.g" - - case 214: { - ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW); - } break; - --#line 2277 "./glsl.g" -+#line 2271 "./glsl.g" - - case 215: { - ast(1) = makeBasicType(T_SAMPLERCUBEARRAY); - } break; - --#line 2284 "./glsl.g" -+#line 2278 "./glsl.g" - - case 216: { - ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW); - } break; - --#line 2291 "./glsl.g" -+#line 2285 "./glsl.g" - - case 217: { - ast(1) = makeBasicType(T_ISAMPLER1D); - } break; - --#line 2298 "./glsl.g" -+#line 2292 "./glsl.g" - - case 218: { - ast(1) = makeBasicType(T_ISAMPLER2D); - } break; - --#line 2305 "./glsl.g" -+#line 2299 "./glsl.g" - - case 219: { - ast(1) = makeBasicType(T_ISAMPLER3D); - } break; - --#line 2312 "./glsl.g" -+#line 2306 "./glsl.g" - - case 220: { - ast(1) = makeBasicType(T_ISAMPLERCUBE); - } break; - --#line 2319 "./glsl.g" -+#line 2313 "./glsl.g" - - case 221: { - ast(1) = makeBasicType(T_ISAMPLER1DARRAY); - } break; - --#line 2326 "./glsl.g" -+#line 2320 "./glsl.g" - - case 222: { - ast(1) = makeBasicType(T_ISAMPLER2DARRAY); - } break; - --#line 2333 "./glsl.g" -+#line 2327 "./glsl.g" - - case 223: { - ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY); - } break; - --#line 2340 "./glsl.g" -+#line 2334 "./glsl.g" - - case 224: { - ast(1) = makeBasicType(T_USAMPLER1D); - } break; - --#line 2347 "./glsl.g" -+#line 2341 "./glsl.g" - - case 225: { - ast(1) = makeBasicType(T_USAMPLER2D); - } break; - --#line 2354 "./glsl.g" -+#line 2348 "./glsl.g" - - case 226: { - ast(1) = makeBasicType(T_USAMPLER3D); - } break; - --#line 2361 "./glsl.g" -+#line 2355 "./glsl.g" - - case 227: { - ast(1) = makeBasicType(T_USAMPLERCUBE); - } break; - --#line 2368 "./glsl.g" -+#line 2362 "./glsl.g" - - case 228: { - ast(1) = makeBasicType(T_USAMPLER1DARRAY); - } break; - --#line 2375 "./glsl.g" -+#line 2369 "./glsl.g" - - case 229: { - ast(1) = makeBasicType(T_USAMPLER2DARRAY); - } break; - --#line 2382 "./glsl.g" -+#line 2376 "./glsl.g" - - case 230: { - ast(1) = makeBasicType(T_USAMPLERCUBEARRAY); - } break; - --#line 2389 "./glsl.g" -+#line 2383 "./glsl.g" - - case 231: { - ast(1) = makeBasicType(T_SAMPLER2DRECT); - } break; - --#line 2396 "./glsl.g" -+#line 2390 "./glsl.g" - - case 232: { - ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW); - } break; - --#line 2403 "./glsl.g" -+#line 2397 "./glsl.g" - - case 233: { - ast(1) = makeBasicType(T_ISAMPLER2DRECT); - } break; - --#line 2410 "./glsl.g" -+#line 2404 "./glsl.g" - - case 234: { - ast(1) = makeBasicType(T_USAMPLER2DRECT); - } break; - --#line 2417 "./glsl.g" -+#line 2411 "./glsl.g" - - case 235: { - ast(1) = makeBasicType(T_SAMPLERBUFFER); - } break; - --#line 2424 "./glsl.g" -+#line 2418 "./glsl.g" - - case 236: { - ast(1) = makeBasicType(T_ISAMPLERBUFFER); - } break; - --#line 2431 "./glsl.g" -+#line 2425 "./glsl.g" - - case 237: { - ast(1) = makeBasicType(T_USAMPLERBUFFER); - } break; - --#line 2438 "./glsl.g" -+#line 2432 "./glsl.g" - - case 238: { - ast(1) = makeBasicType(T_SAMPLER2DMS); - } break; - --#line 2445 "./glsl.g" -+#line 2439 "./glsl.g" - - case 239: { - ast(1) = makeBasicType(T_ISAMPLER2DMS); - } break; - --#line 2452 "./glsl.g" -+#line 2446 "./glsl.g" - - case 240: { - ast(1) = makeBasicType(T_USAMPLER2DMS); - } break; - --#line 2459 "./glsl.g" -+#line 2453 "./glsl.g" - - case 241: { - ast(1) = makeBasicType(T_SAMPLER2DMSARRAY); - } break; - --#line 2466 "./glsl.g" -+#line 2460 "./glsl.g" - - case 242: { - ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY); - } break; - --#line 2473 "./glsl.g" -+#line 2467 "./glsl.g" - - case 243: { - ast(1) = makeBasicType(T_USAMPLER2DMSARRAY); - } break; - --#line 2480 "./glsl.g" -+#line 2474 "./glsl.g" - - case 244: { - // nothing to do. - } break; - --#line 2487 "./glsl.g" -+#line 2481 "./glsl.g" - - case 245: { - ast(1) = makeAstNode<NamedTypeAST>(string(1)); - } break; - --#line 2494 "./glsl.g" -+#line 2488 "./glsl.g" - - case 246: { - sym(1).precision = TypeAST::Highp; - } break; - --#line 2501 "./glsl.g" -+#line 2495 "./glsl.g" - - case 247: { - sym(1).precision = TypeAST::Mediump; - } break; - --#line 2508 "./glsl.g" -+#line 2502 "./glsl.g" - - case 248: { - sym(1).precision = TypeAST::Lowp; - } break; - --#line 2515 "./glsl.g" -+#line 2509 "./glsl.g" - - case 249: { - ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list); - } break; - --#line 2522 "./glsl.g" -+#line 2516 "./glsl.g" - - case 250: { - ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list); - } break; - --#line 2529 "./glsl.g" -+#line 2523 "./glsl.g" - - case 251: { - // nothing to do. - } break; - --#line 2536 "./glsl.g" -+#line 2530 "./glsl.g" - - case 252: { - sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); - } break; - --#line 2543 "./glsl.g" -+#line 2537 "./glsl.g" - - case 253: { - sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list); - } break; - --#line 2550 "./glsl.g" -+#line 2544 "./glsl.g" - - case 254: { - sym(1).field_list = StructTypeAST::fixInnerTypes -@@ -1870,106 +1870,106 @@ case 254: { - sym(1).type_qualifier.layout_list), sym(3).field_list); - } break; - --#line 2560 "./glsl.g" -+#line 2554 "./glsl.g" - - case 255: { - // nothing to do. - sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field); - } break; - --#line 2568 "./glsl.g" -+#line 2562 "./glsl.g" - - case 256: { - sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field); - } break; - --#line 2575 "./glsl.g" -+#line 2569 "./glsl.g" - - case 257: { - sym(1).field = makeAstNode<StructTypeAST::Field>(string(1)); - } break; - --#line 2582 "./glsl.g" -+#line 2576 "./glsl.g" - - case 258: { - sym(1).field = makeAstNode<StructTypeAST::Field> - (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0)); - } break; - --#line 2590 "./glsl.g" -+#line 2584 "./glsl.g" - - case 259: { - sym(1).field = makeAstNode<StructTypeAST::Field> - (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3))); - } break; - --#line 2598 "./glsl.g" -+#line 2592 "./glsl.g" - - case 260: { - // nothing to do. - } break; - --#line 2605 "./glsl.g" -+#line 2599 "./glsl.g" - - case 261: { - ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration); - } break; - --#line 2612 "./glsl.g" -+#line 2606 "./glsl.g" - - case 262: { - // nothing to do. - } break; - --#line 2619 "./glsl.g" -+#line 2613 "./glsl.g" - - case 263: { - // nothing to do. - } break; - --#line 2626 "./glsl.g" -+#line 2620 "./glsl.g" - - case 264: { - // nothing to do. - } break; - --#line 2633 "./glsl.g" -+#line 2627 "./glsl.g" - - case 265: { - // nothing to do. - } break; - --#line 2640 "./glsl.g" -+#line 2634 "./glsl.g" - - case 266: { - // nothing to do. - } break; - --#line 2647 "./glsl.g" -+#line 2641 "./glsl.g" - - case 267: { - // nothing to do. - } break; - --#line 2654 "./glsl.g" -+#line 2648 "./glsl.g" - - case 268: { - // nothing to do. - } break; - --#line 2661 "./glsl.g" -+#line 2655 "./glsl.g" - - case 269: { - // nothing to do. - } break; - --#line 2668 "./glsl.g" -+#line 2662 "./glsl.g" - - case 270: { - // nothing to do. - } break; - --#line 2675 "./glsl.g" -+#line 2669 "./glsl.g" - - case 271: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); -@@ -1978,7 +1978,7 @@ case 271: { - ast(1) = stmt; - } break; - --#line 2685 "./glsl.g" -+#line 2679 "./glsl.g" - - case 272: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); -@@ -1987,19 +1987,19 @@ case 272: { - ast(1) = stmt; - } break; - --#line 2695 "./glsl.g" -+#line 2689 "./glsl.g" - - case 273: { - // nothing to do. - } break; - --#line 2702 "./glsl.g" -+#line 2696 "./glsl.g" - - case 274: { - // nothing to do. - } break; - --#line 2709 "./glsl.g" -+#line 2703 "./glsl.g" - - case 275: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); -@@ -2008,7 +2008,7 @@ case 275: { - ast(1) = stmt; - } break; - --#line 2719 "./glsl.g" -+#line 2713 "./glsl.g" - - case 276: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); -@@ -2017,186 +2017,186 @@ case 276: { - ast(1) = stmt; - } break; - --#line 2729 "./glsl.g" -+#line 2723 "./glsl.g" - - case 277: { - sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement); - } break; - --#line 2736 "./glsl.g" -+#line 2730 "./glsl.g" - - case 278: { - sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement); - } break; - --#line 2743 "./glsl.g" -+#line 2737 "./glsl.g" - - case 279: { - ast(1) = makeAstNode<CompoundStatementAST>(); // Empty statement - } break; - --#line 2750 "./glsl.g" -+#line 2744 "./glsl.g" - - case 280: { - ast(1) = makeAstNode<ExpressionStatementAST>(expression(1)); - } break; - --#line 2757 "./glsl.g" -+#line 2751 "./glsl.g" - - case 281: { - ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); - } break; - --#line 2764 "./glsl.g" -+#line 2758 "./glsl.g" - - case 282: { - sym(1).ifstmt.thenClause = statement(1); - sym(1).ifstmt.elseClause = statement(3); - } break; - --#line 2772 "./glsl.g" -+#line 2766 "./glsl.g" - - case 283: { - sym(1).ifstmt.thenClause = statement(1); - sym(1).ifstmt.elseClause = 0; - } break; - --#line 2780 "./glsl.g" -+#line 2774 "./glsl.g" - - case 284: { - // nothing to do. - } break; - --#line 2787 "./glsl.g" -+#line 2781 "./glsl.g" - - case 285: { - ast(1) = makeAstNode<DeclarationExpressionAST> - (type(1), string(2), expression(4)); - } break; - --#line 2795 "./glsl.g" -+#line 2789 "./glsl.g" - - case 286: { - ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6)); - } break; - --#line 2802 "./glsl.g" -+#line 2796 "./glsl.g" - - case 287: { - ast(1) = makeAstNode<CompoundStatementAST>(); - } break; - --#line 2809 "./glsl.g" -+#line 2803 "./glsl.g" - - case 288: { - ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list); - } break; - --#line 2816 "./glsl.g" -+#line 2810 "./glsl.g" - - case 289: { - ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2)); - } break; - --#line 2823 "./glsl.g" -+#line 2817 "./glsl.g" - - case 290: { - ast(1) = makeAstNode<CaseLabelStatementAST>(); - } break; - --#line 2830 "./glsl.g" -+#line 2824 "./glsl.g" - - case 291: { - ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5)); - } break; - --#line 2837 "./glsl.g" -+#line 2831 "./glsl.g" - - case 292: { - ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5)); - } break; - --#line 2844 "./glsl.g" -+#line 2838 "./glsl.g" - - case 293: { - ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); - } break; - --#line 2851 "./glsl.g" -+#line 2845 "./glsl.g" - - case 294: { - // nothing to do. - } break; - --#line 2858 "./glsl.g" -+#line 2852 "./glsl.g" - - case 295: { - // nothing to do. - } break; - --#line 2865 "./glsl.g" -+#line 2859 "./glsl.g" - - case 296: { - // nothing to do. - } break; - --#line 2872 "./glsl.g" -+#line 2866 "./glsl.g" - - case 297: { - // nothing to do. - } break; - --#line 2879 "./glsl.g" -+#line 2873 "./glsl.g" - - case 298: { - sym(1).forstmt.condition = expression(1); - sym(1).forstmt.increment = 0; - } break; - --#line 2887 "./glsl.g" -+#line 2881 "./glsl.g" - - case 299: { - sym(1).forstmt.condition = expression(1); - sym(1).forstmt.increment = expression(3); - } break; - --#line 2895 "./glsl.g" -+#line 2889 "./glsl.g" - - case 300: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue); - } break; - --#line 2902 "./glsl.g" -+#line 2896 "./glsl.g" - - case 301: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break); - } break; - --#line 2909 "./glsl.g" -+#line 2903 "./glsl.g" - - case 302: { - ast(1) = makeAstNode<ReturnStatementAST>(); - } break; - --#line 2916 "./glsl.g" -+#line 2910 "./glsl.g" - - case 303: { - ast(1) = makeAstNode<ReturnStatementAST>(expression(2)); - } break; - --#line 2923 "./glsl.g" -+#line 2917 "./glsl.g" - - case 304: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard); - } break; - --#line 2930 "./glsl.g" -+#line 2924 "./glsl.g" - - case 305: { - ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list); - } break; - --#line 2937 "./glsl.g" -+#line 2931 "./glsl.g" - - case 306: { - if (sym(1).declaration) { -@@ -2207,7 +2207,7 @@ case 306: { - } - } break; - --#line 2949 "./glsl.g" -+#line 2943 "./glsl.g" - - case 307: { - if (sym(1).declaration_list && sym(2).declaration) { -@@ -2223,49 +2223,49 @@ case 307: { - } - } break; - --#line 2966 "./glsl.g" -+#line 2960 "./glsl.g" - - case 308: { - // nothing to do. - } break; - --#line 2973 "./glsl.g" -+#line 2967 "./glsl.g" - - case 309: { - // nothing to do. - } break; - --#line 2980 "./glsl.g" -+#line 2974 "./glsl.g" - - case 310: { - ast(1) = 0; - } break; - --#line 2987 "./glsl.g" -+#line 2981 "./glsl.g" - - case 311: { - function(1)->body = statement(2); - } break; - --#line 2994 "./glsl.g" -+#line 2988 "./glsl.g" - - case 312: { - ast(1) = 0; - } break; - --#line 3002 "./glsl.g" -+#line 2996 "./glsl.g" - - case 313: { - ast(1) = ast(2); - } break; - --#line 3009 "./glsl.g" -+#line 3003 "./glsl.g" - - case 314: { - ast(1) = ast(2); - } break; - --#line 3015 "./glsl.g" -+#line 3009 "./glsl.g" - - } // end switch - } // end Parser::reduce() -diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h -index 7bf70e2..bab2616 100644 ---- a/src/libs/glsl/glslparser.h -+++ b/src/libs/glsl/glslparser.h -@@ -1,5 +1,5 @@ - --#line 217 "./glsl.g" -+#line 215 "./glsl.g" - - /************************************************************************** - ** --- -1.7.10 - diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop deleted file mode 100644 index 0fd562bd9..000000000 --- a/community-testing/qtcreator/qtcreator.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/qtcreator -Name=Qt-Creator -GenericName=C++ IDE -X-KDE-StartupNotify=true -Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png -Terminal=false -Type=Application -Categories=Qt;Development diff --git a/community-testing/qtcreator/qtcreator.install b/community-testing/qtcreator/qtcreator.install deleted file mode 100644 index 4d4a283db..000000000 --- a/community-testing/qtcreator/qtcreator.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD deleted file mode 100644 index 09fe4712c..000000000 --- a/community-testing/tmw/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 75740 2012-08-30 16:55:56Z heftig $ -# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=tmw -pkgver=0.6.1 -pkgrel=1 -pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." -arch=('i686' 'x86_64') -url="http://themanaworld.org" -license=('GPL') -depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' - 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') -makedepends=('cmake' 'mesa') -#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) -source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver) -md5sums=('b021e368c813fb95bea00bbf02e6d607') - -build() { - cd $srcdir/mana-mana-* - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/mana-mana-* - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD deleted file mode 100644 index 901d43506..000000000 --- a/community-testing/warmux/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 75742 2012-08-30 16:56:08Z heftig $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: pukyxd -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> - -pkgname=warmux -pkgver=11.04.1 -pkgrel=5 -pkgdesc="A clone of the worms game" -arch=('i686' 'x86_64') -url="http://www.wormux.org/" -license=('GPL') -makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') -replaces=('wormux') -source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - include-zlib.patch - gcc-fix.patch) -md5sums=('26ff65c43a9bb61a3f0529c98b943e35' - 'c8285955e880f80e3c68312715a3061c' - 'ab50d613d3fa3f71262b1d2fc71641b1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver/.1/}" - - # libpng 1.5 fix - patch -Np1 -i ../include-zlib.patch - # gcc fix - patch -Np1 -i ../gcc-fix.patch - - ./configure --prefix=/usr - make -} - -package() { - depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") - - cd "${srcdir}/${pkgname}-${pkgver/.1/}" - - make DESTDIR="${pkgdir}" install - rm -r ${pkgdir}/usr/share/warmux -} diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch deleted file mode 100644 index 1ac476b92..000000000 --- a/community-testing/warmux/gcc-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -## i-love-you-lordheavy.patch [diff] -diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp ---- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 -+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 -@@ -81,7 +81,7 @@ - } - - // Build an action from a network packet --Action::Action(const char *buffer, DistantComputer* _creator) -+Action::Action(char *buffer, DistantComputer* _creator) - { - m_creator = _creator; - -diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h ---- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 -+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 -@@ -168,7 +168,7 @@ - Action(Action_t type, Double value1, Double value2); - - // Build an action from a network packet -- Action(const char* buffer, DistantComputer* _creator); -+ Action(char* buffer, DistantComputer* _creator); - - ~Action(); - -Description: Fix FTBFS with gcc 4.7. -Author: Felix Geyer <debfx-pkg@fobos.de> - ---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp -+++ warmux-11.04.1+repack/tools/list_games/main.cpp -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <unistd.h> - #include <WARMUX_types.h> - #include <WARMUX_network.h> - #include <WARMUX_index_server.h> diff --git a/community-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch deleted file mode 100644 index c7e77aba1..000000000 --- a/community-testing/warmux/include-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp ---- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 -+++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 -@@ -25,6 +25,7 @@ - #include <SDL_image.h> - #include <SDL_rotozoom.h> - #include <png.h> -+#include <zlib.h> - - #include "graphic/surface.h" - #include "tool/math_tools.h" diff --git a/community-testing/zathura-djvu/PKGBUILD b/community-testing/zathura-djvu/PKGBUILD deleted file mode 100644 index be797feb3..000000000 --- a/community-testing/zathura-djvu/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 75779 2012-08-31 00:57:33Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: karnath <karnathtorjian@gmail.com> - -pkgname=zathura-djvu -pkgver=0.2.1 -pkgrel=1 -pkgdesc="Adds DjVu support to zathura by using the djvulibre library" -arch=('i686' 'x86_64') -url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" -license=('custom') -depends=('djvulibre' 'zathura') -source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz") -md5sums=('c3525b43b74bb0777a2b3561f7dcde06') - -build(){ - cd "${srcdir}/$pkgname-$pkgver" - make -} -package(){ - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - diff --git a/community-testing/zathura-pdf-poppler/PKGBUILD b/community-testing/zathura-pdf-poppler/PKGBUILD deleted file mode 100644 index b1320b1cb..000000000 --- a/community-testing/zathura-pdf-poppler/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: karnath <karnathtorjian@gmail.com> - -pkgname=zathura-pdf-poppler -pkgver=0.2.1 -pkgrel=1 -pkgdesc="Adds pdf support to zathura by using the poppler engine" -arch=('i686' 'x86_64') -url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" -license=('custom') -depends=('poppler-glib' 'zathura') -source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('6f36fe141f8e5e9e8d71eb143eaaa1c1') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - make -} -package(){ - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-testing/zathura/PKGBUILD b/community-testing/zathura/PKGBUILD deleted file mode 100644 index cd7da39a5..000000000 --- a/community-testing/zathura/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 75777 2012-08-31 00:57:27Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: ML <neldoreth> - -pkgname=zathura -pkgver=0.2.1 -pkgrel=1 -pkgdesc="a document viewer" -arch=('i686' 'x86_64') -url="http://pwmt.org/projects/zathura/" -license=('custom') -depends=('girara-gtk2' 'cairo' 'sqlite') -makedepends=('python2-docutils') -optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') -install=zathura.install -source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz - bash-completion) -md5sums=('2b606a5db61c80b0f1208e9f1df468c2' - 'cac20c37f0e77ba62a8138788f4ccabb') - -build() { - cd $srcdir/zathura-$pkgver - make ZATHURA_GTK_VERSION=2 -} - -package() { - cd $srcdir/zathura-$pkgver - make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura -} diff --git a/community-testing/zathura/bash-completion b/community-testing/zathura/bash-completion deleted file mode 100644 index 41c3825b6..000000000 --- a/community-testing/zathura/bash-completion +++ /dev/null @@ -1,29 +0,0 @@ -_zathura() { - _init_completion || return - - EXTENTIONS='' - for PLUGIN in /usr/lib/zathura/*.so; do - case ${PLUGIN##*/} in - pdf.so) - EXTENTIONS="$EXTENTIONS|pdf" - ;; - ps.so) - EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" - ;; - djvu.so) - EXTENTIONS="$EXTENTIONS|djvu|djv" - ;; - epub.so) - EXTENTIONS="$EXTENTIONS|epub" - ;; - cb.so) - EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" - ;; - *) - ;; - esac - done - - _filedir "${EXTENTIONS#|}" -} && -complete -F _zathura zathura diff --git a/community-testing/zathura/zathura.install b/community-testing/zathura/zathura.install deleted file mode 100644 index f450cf9b8..000000000 --- a/community-testing/zathura/zathura.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - which gtk-update-icon-cache >/dev/null && \ - [ -d usr/share/icons/hicolor ] && \ - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/baobab/PKGBUILD b/gnome-unstable/baobab/PKGBUILD deleted file mode 100644 index 433193ef8..000000000 --- a/gnome-unstable/baobab/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 166847 2012-09-19 21:56:41Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=baobab -pkgver=3.5.92 -pkgrel=1 -pkgdesc="A graphical directory tree analyzer" -arch=(i686 x86_64) -url="http://gnome.org" -license=('GPL2') -depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('intltool' 'itstool') -groups=('gnome-extra') -install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d8b5866c003485d4e88a1d076bfb27864de9f849985cbd0ad517a37d07b97c1b') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/baobab/baobab.install b/gnome-unstable/baobab/baobab.install deleted file mode 100644 index 847019792..000000000 --- a/gnome-unstable/baobab/baobab.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/clutter-gtk/PKGBUILD b/gnome-unstable/clutter-gtk/PKGBUILD deleted file mode 100644 index 5131e098c..000000000 --- a/gnome-unstable/clutter-gtk/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 166851 2012-09-19 22:06:57Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=clutter-gtk -pkgver=1.3.2 -pkgrel=1 -pkgdesc="GTK clutter widget" -arch=('i686' 'x86_64') -url="http://clutter-project.org/" -options=('!libtool') -license=('LGPL') -depends=('clutter' 'gtk3') -makedepends=('gobject-introspection') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ee50538daca9447be6ad1ed0d049fbb2dc5a1bcaecd13fda847b9b66f922ee37') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD deleted file mode 100644 index aef648b1a..000000000 --- a/gnome-unstable/clutter/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 166849 2012-09-19 22:00:36Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=clutter -pkgver=1.11.16 -pkgrel=1 -pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" -arch=('i686' 'x86_64') -url="http://clutter-project.org/" -options=('!libtool') -license=('LGPL') -depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') -makedepends=('gobject-introspection' 'mesa') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8f50dfa0b1db93d2193dced4640589cbfe1dfed4b06d4463420c7909cef39f93') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --enable-introspection - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD deleted file mode 100644 index a36e354ca..000000000 --- a/gnome-unstable/eog/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 166438 2012-09-07 19:26:51Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=eog -pkgver=3.5.91 -pkgrel=1 -pkgdesc="Eye of Gnome: An image viewing and cataloging program" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') -makedepends=('gtk-doc' 'intltool' 'itstool') -install=eog.install -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('316966a89666df57c1ed55a58eed6eb59701d356ed4594978e4c4b4d05b1e9c2') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop -} diff --git a/gnome-unstable/eog/eog.install b/gnome-unstable/eog/eog.install deleted file mode 100644 index 1571179ca..000000000 --- a/gnome-unstable/eog/eog.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/evolution-data-server/PKGBUILD b/gnome-unstable/evolution-data-server/PKGBUILD deleted file mode 100644 index b306325af..000000000 --- a/gnome-unstable/evolution-data-server/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 166825 2012-09-19 16:43:29Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-data-server -pkgver=3.5.92 -pkgrel=1 -pkgdesc="Centralized access to appointments and contacts" -arch=('i686' 'x86_64') -depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') -options=('!libtool') -install=$pkgname.install -url="http://www.gnome.org" -license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('461e67b9c2f7ae18cf72d0d8273378729001aa9fd87ddbd695008179b5925180') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/evolution-data-server/evolution-data-server.install b/gnome-unstable/evolution-data-server/evolution-data-server.install deleted file mode 100644 index 29a359805..000000000 --- a/gnome-unstable/evolution-data-server/evolution-data-server.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade () { - post_install -} - -post_remove () { - post_install -} diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD deleted file mode 100644 index b7a579c92..000000000 --- a/gnome-unstable/evolution/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 166834 2012-09-19 19:34:06Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution -pkgver=3.5.92 -pkgrel=1 -pkgdesc="Manage your email, contacts and schedule" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager') -optdepends=('bogofilter: possible junk filter plugin' - 'spamassassin: possible junk filter plugin') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=evolution.install -url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('dfead9f5bde36527ed4410e62004e42d4677e319d2c6e02d96ede5406516c25f') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --enable-nss=yes \ - --with-openldap=yes \ - --enable-smime=yes \ - --with-krb5=/usr \ - --disable-schemas-compile - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/evolution/evolution.install b/gnome-unstable/evolution/evolution.install deleted file mode 100644 index 67eca41f0..000000000 --- a/gnome-unstable/evolution/evolution.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then - gconfpkg --uninstall evolution - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gcr/PKGBUILD b/gnome-unstable/gcr/PKGBUILD deleted file mode 100644 index 63a5db35f..000000000 --- a/gnome-unstable/gcr/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 166819 2012-09-19 16:07:31Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gcr -pkgver=3.5.92 -pkgrel=1 -pkgdesc="A library for bits of crypto UI and parsing" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL2') -depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') -makedepends=('intltool' 'gobject-introspection') -options=(!libtool) -install=gcr.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('040919b750b7177ccfbfeba0910848f83356bc3b52e231f47aebbcf657cd6a34') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ - --libexec=/usr/lib/gcr \ - --disable-static \ - --disable-update-mime \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gcr/gcr.install b/gnome-unstable/gcr/gcr.install deleted file mode 100644 index 8677671c4..000000000 --- a/gnome-unstable/gcr/gcr.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install () { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-mime-database /usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade () { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD deleted file mode 100644 index 77ff144e7..000000000 --- a/gnome-unstable/gjs/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 166790 2012-09-19 09:17:23Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gjs -pkgver=1.33.14 -pkgrel=1 -pkgdesc="Javascript Bindings for GNOME" -arch=('i686' 'x86_64') -url="http://live.gnome.org/Gjs" -license=('GPL') -depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') -options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e7c4865dadf39bb0e87cd3a613d364214c8e90fa5488e12474b1cb1fd7487c96') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|python|python2|' scripts/make-tests - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD deleted file mode 100644 index 668d51213..000000000 --- a/gnome-unstable/gnome-desktop/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 166428 2012-09-07 18:13:29Z jgc $ -# Maintainer: Jan de Groot <jan@archlinux.org> - -pkgname=gnome-desktop -pkgver=3.5.91 -pkgrel=1 -epoch=1 -pkgdesc="Library with common API for various GNOME modules" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('68b85b31e137af27edc0f9a0b56c9113f4df61d0172716c97b3e96ad12a2112a') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-desktop \ - --with-gnome-distributor="Arch Linux" - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD deleted file mode 100644 index c6e032307..000000000 --- a/gnome-unstable/gnome-keyring/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -#$Id: PKGBUILD 166815 2012-09-19 15:07:40Z jgc $ -# Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=gnome-keyring -pkgver=3.5.92 -pkgrel=1 -pkgdesc="GNOME Password Management daemon" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('gtk3' 'gcr' 'libcap-ng') -makedepends=('intltool') -groups=('gnome') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3765fb15d91cb984f272101b27b7457d56c3e7509acebe0c8c1597d51553ea57') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-keyring/gnome-keyring.install b/gnome-unstable/gnome-keyring/gnome-keyring.install deleted file mode 100644 index c351377a2..000000000 --- a/gnome-unstable/gnome-keyring/gnome-keyring.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/gnome-unstable/gnome-online-accounts/PKGBUILD b/gnome-unstable/gnome-online-accounts/PKGBUILD deleted file mode 100644 index 1e5d89a04..000000000 --- a/gnome-unstable/gnome-online-accounts/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 166817 2012-09-19 15:54:37Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gnome-online-accounts -pkgver=3.5.92 -pkgrel=1 -pkgdesc="GNOME service to access online accounts" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL') -depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret') -makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') -options=(!libtool) -install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a99aab0aea495970dd6c07d4e62c05a71d47addfa5e53e5aece86af8f1fc1479') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install b/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install deleted file mode 100644 index 525ecff63..000000000 --- a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD deleted file mode 100644 index 2006f5241..000000000 --- a/gnome-unstable/gnome-session/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 166422 2012-09-07 17:46:20Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-session -pkgver=3.5.91 -pkgrel=1 -pkgdesc="The GNOME Session Handler" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' - 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' - 'upower') -makedepends=('intltool' 'mesa' 'xtrans') -options=('!emptydirs') -install=gnome-session.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-session-3.3.1-llvmpipe.patch timeout.patch) -sha256sums=('407fe44f8567318a789ae013f2f5f6da27b458e93ad4f66e287719e23b4e6c84' - '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' - '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') - -build() { - cd $pkgname-$pkgver - - # Allow software rendering - patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch - - # Increase timeout, for slow machines - patch -Np1 -i ../timeout.patch - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile --enable-systemd - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch deleted file mode 100644 index 40da1c9b7..000000000 --- a/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility ---- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 -+++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 -@@ -20,4 +20,4 @@ - - # Gallium has softpipe and llvmpipe - -softpipe ---llvmpipe -+#llvmpipe diff --git a/gnome-unstable/gnome-session/gnome-session.install b/gnome-unstable/gnome-session/gnome-session.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/gnome-unstable/gnome-session/gnome-session.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-session/timeout.patch b/gnome-unstable/gnome-session/timeout.patch deleted file mode 100644 index a26b0dcf5..000000000 --- a/gnome-unstable/gnome-session/timeout.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c ---- gnome-session-3.4.2/gnome-session/gsm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 -+++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 -@@ -36,7 +36,7 @@ - #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" - - /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ --#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */ -+#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */ - - typedef void (*GsmFillHandleProvider) (const char *provides, - const char *default_provider, -diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c ---- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 -@@ -30,7 +30,7 @@ - #include <X11/Xatom.h> - - /* Wait up to this long for a running check to finish */ --#define PROPERTY_CHANGE_TIMEOUT 5000 -+#define PROPERTY_CHANGE_TIMEOUT 12000 - - /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ - #define NO_ACCEL 0 diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD deleted file mode 100644 index c9c72b58c..000000000 --- a/gnome-unstable/gnome-settings-daemon/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 166445 2012-09-07 22:40:50Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-settings-daemon -pkgver=3.5.91 -pkgrel=1 -pkgdesc="The GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' - 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus') -makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') -options=('!emptydirs' '!libtool') -install=gnome-settings-daemon.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('005ad39fb50259fa2a8780db98498bb0af50ce4002cfe0c6e3017107df25ae9e') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ - --enable-systemd - - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install b/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD deleted file mode 100644 index eb04148ea..000000000 --- a/gnome-unstable/gnome-themes-standard/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 166794 2012-09-19 09:49:03Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gnome-themes-standard -pkgver=3.5.92 -pkgrel=1 -pkgdesc="Default themes for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://www.gnome.org" -license=('GPL2') -depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg') -makedepends=('intltool') -groups=('gnome') -replaces=('gnome-themes') -conflicts=('gnome-themes') -options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('234507791a2d863a41c4e5439991afa95180a1d31c1f2bd4273d3b4a212aed2d') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD deleted file mode 100644 index 6625a5a2a..000000000 --- a/gnome-unstable/gtk3/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 166786 2012-09-19 08:51:48Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtk3 -pkgver=3.5.18 -pkgrel=1 -pkgdesc="GObject-based multi-platform GUI toolkit (v3)" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk') -makedepends=('gobject-introspection') -options=('!libtool') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini wacom.patch) -sha256sums=('2dc6779e447332b4963d4ef3ac673e590aaced5ea4e71998c063dc43dd866fad' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') -build() { - cd "gtk+-$pkgver" - - # Partially revert BGO#673440 in order to fix BGO#674157 - patch -Np1 -i ../wacom.patch - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-gtk2-dependency \ - --disable-schemas-compile - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "gtk+-$pkgver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" -} diff --git a/gnome-unstable/gtk3/gtk3.install b/gnome-unstable/gtk3/gtk3.install deleted file mode 100644 index ca20d2865..000000000 --- a/gnome-unstable/gtk3/gtk3.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - /usr/bin/gtk-query-immodules-3.0 --update-cache - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache -} - -post_remove() { - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/gnome-unstable/gtk3/settings.ini b/gnome-unstable/gtk3/settings.ini deleted file mode 100644 index 039000d38..000000000 --- a/gnome-unstable/gtk3/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-fallback-icon-theme = gnome diff --git a/gnome-unstable/gtk3/wacom.patch b/gnome-unstable/gtk3/wacom.patch deleted file mode 100644 index 79ad84fc6..000000000 --- a/gnome-unstable/gtk3/wacom.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c ---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 -+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 -@@ -331,6 +331,8 @@ - input_source = GDK_SOURCE_ERASER; - else if (strstr (tmp_name, "cursor")) - input_source = GDK_SOURCE_CURSOR; -+ else if (strstr (tmp_name, "finger")) -+ input_source = GDK_SOURCE_TOUCHSCREEN; - else if (strstr (tmp_name, "wacom") || - strstr (tmp_name, "pen")) - input_source = GDK_SOURCE_PEN; diff --git a/gnome-unstable/gtkhtml4/PKGBUILD b/gnome-unstable/gtkhtml4/PKGBUILD deleted file mode 100644 index 17362b680..000000000 --- a/gnome-unstable/gtkhtml4/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 166827 2012-09-19 18:44:25Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtkhtml4 -_pkgbasename=gtkhtml -pkgver=4.5.91 -pkgrel=1 -pkgdesc="A lightweight HTML renderer/editor widget for GTK3" -arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') -makedepends=('intltool') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('3525e7b7ec16218bc05d6c3eda69ecd3012e4c6d7978dd80918a07112ad6ea11') - -build() { - cd "$_pkgbasename-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gtkhtml4 \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD deleted file mode 100644 index 9bedc8196..000000000 --- a/gnome-unstable/gvfs/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 166502 2012-09-08 12:38:07Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.13.8 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') -url="http://www.gnome.org" -options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('7c6113facabba82fea0a012170ac7a3b3a69a2636265ec9d5066a90ab743ee2f') - -build() { - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gvfs \ - --with-bash-completion-dir=/usr/share/bash-completion/completions - make -} - -package_gvfs() { - pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret') - optdepends=('gvfs-afc: AFC (mobile devices) support' - 'gvfs-smb: SMB/CIFS (Windows client) support' - 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' - 'gvfs-obexftp: ObexFTP (bluetooth) support' - 'gvfs-afp: Apple Filing Protocol (AFP) support' - 'gtk3: Recent files support') - install=gvfs.install - - cd "$pkgbase-$pkgver" - sed -e 's/^am__append_4/#am__append_4/' \ - -e 's/^am__append_5/#am__append_5/' \ - -i monitor/Makefile - make DESTDIR="$pkgdir" install - - cd "$pkgdir" - rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} - rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount - rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml - rm usr/share/GConf/gsettings/gvfs-smb.convert -} - -package_gvfs-smb() { - pkgdesc="SMB/CIFS (Windows client) backend for gvfs" - depends=("gvfs=$pkgver" 'smbclient') - install=gvfs-smb.install - - cd "$pkgbase-$pkgver/daemon" - install -m755 -d "$pkgdir/usr/lib/gvfs" - install -m755 -d "$pkgdir/usr/share/gvfs/mounts" - - install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" - install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" - - install -Dm644 org.gnome.system.smb.gschema.xml \ - "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" - install -Dm644 gvfs-smb.convert \ - "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" -} - -package_gvfs-afc() { - pkgdesc="AFC (mobile devices) backend for gvfs" - depends=("gvfs=$pkgver" 'libimobiledevice') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" - install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" - - cd "$srcdir/$pkgbase-$pkgver/monitor/afc" - make DESTDIR="$pkgdir" install -} - -package_gvfs-gphoto2() { - pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" - install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" - - cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" - make DESTDIR="$pkgdir" install -} - -package_gvfs-obexftp() { - pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" -} - -package_gvfs-afp() { - pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" - depends=("gvfs=$pkgver") - install=gvfs-module.install - install -m755 -d "$pkgdir/usr/lib/gvfs" - install -m755 -d "$pkgdir/usr/share/gvfs/mounts" - - cd "$pkgbase-$pkgver/daemon" - install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" - install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" -} diff --git a/gnome-unstable/gvfs/gvfs-module.install b/gnome-unstable/gvfs/gvfs-module.install deleted file mode 100644 index 09d1f11ec..000000000 --- a/gnome-unstable/gvfs/gvfs-module.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} diff --git a/gnome-unstable/gvfs/gvfs-smb.install b/gnome-unstable/gvfs/gvfs-smb.install deleted file mode 100644 index da6a2ab6d..000000000 --- a/gnome-unstable/gvfs/gvfs-smb.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/gnome-unstable/gvfs/gvfs.install b/gnome-unstable/gvfs/gvfs.install deleted file mode 100644 index 3482d99e3..000000000 --- a/gnome-unstable/gvfs/gvfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/gnome-unstable/harfbuzz/PKGBUILD b/gnome-unstable/harfbuzz/PKGBUILD deleted file mode 100644 index 3ceed5738..000000000 --- a/gnome-unstable/harfbuzz/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=harfbuzz -pkgver=0.9.4 -pkgrel=1 -pkgdesc="OpenType text shaping engine." -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/HarfBuzz" -license=('MIT') -depends=('icu' 'glib2' 'freetype2') -makedepends=('icu' 'cairo' 'glib2' 'freetype2') -optdepends=('cairo: hb-view program') -options=(!libtool) -source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING" -} diff --git a/gnome-unstable/ibus/PKGBUILD b/gnome-unstable/ibus/PKGBUILD deleted file mode 100644 index 79bf2f9b3..000000000 --- a/gnome-unstable/ibus/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id$ -# Contributor: Rainy <rainylau(at)gmail(dot)com> -# Contributor: Lee.MaRS <leemars at gmail dot com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - -pkgname=ibus -pkgver=1.4.99.20120822 -pkgrel=1 -pkgdesc="Next Generation Input Bus for Linux" -arch=('i686' 'x86_64') -url="http://ibus.googlecode.com" -license=('LGPL') -makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool') -depends=('hicolor-icon-theme' 'gtk2' 'gtk3') -options=('!libtool') -install=ibus.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('46d836b68733953b443859f47ad6991f4584658d') - -build() { - cd ${pkgname}-${pkgver} - export PYTHON=python2 - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ibus \ - --sysconfdir=/etc \ - --disable-gconf \ - --enable-dconf \ - --disable-memconf \ - --disable-ui - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/gnome-unstable/ibus/ibus.install b/gnome-unstable/ibus/ibus.install deleted file mode 100644 index e4e446693..000000000 --- a/gnome-unstable/ibus/ibus.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-query-immodules-3.0 --update-cache - - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_remove() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-query-immodules-3.0 --update-cache - - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD deleted file mode 100644 index 15103ec4e..000000000 --- a/gnome-unstable/json-glib/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 166351 2012-09-06 20:52:29Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=json-glib -pkgver=0.15.2 -pkgrel=1 -pkgdesc="JSON library built on GLib" -arch=('i686' 'x86_64') -url="http://live.gnome.org/JsonGlib" -license=('GPL') -depends=('glib2') -makedepends=('gobject-introspection') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde') - -build(){ - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} - -check(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} diff --git a/gnome-unstable/libgdata/PKGBUILD b/gnome-unstable/libgdata/PKGBUILD deleted file mode 100644 index 2d4a27c97..000000000 --- a/gnome-unstable/libgdata/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 166823 2012-09-19 16:18:37Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgdata -pkgver=0.13.1 -pkgrel=1 -pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts') -makedepends=('intltool' 'gobject-introspection') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('270777da04776537c9f168447c90a5d0672f0faca6bc307dd27204eacc594b6c') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD deleted file mode 100644 index a2599e1c4..000000000 --- a/gnome-unstable/libgnome-keyring/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -#$Id: PKGBUILD 166414 2012-09-07 17:06:04Z jgc $ -#Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=libgnome-keyring -pkgver=3.5.6 -pkgrel=1 -pkgdesc="GNOME keyring client library" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('dbus-core' 'glib2' 'libgcrypt') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c4b99d7d24fe125d4bebb09b468ac086069e2f48ffdb9a33e894ea28542d4467') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-keyring - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/libgweather/PKGBUILD b/gnome-unstable/libgweather/PKGBUILD deleted file mode 100644 index fca60cd53..000000000 --- a/gnome-unstable/libgweather/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 166809 2012-09-19 14:43:44Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgweather -pkgver=3.5.92 -pkgrel=1 -pkgdesc="Provides access to weather information from the net" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org/" -install=libgweather.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gettext-not-xml.patch - no_external_gettext.patch) -sha256sums=('1f1dc6abf9dcfa38d663a4aadfc91a43bc7a5d1dd12ac68f6412c35bc40622cf' - '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533' - 'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672') - -build() { - cd "$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/gettext-not-xml.patch" - patch -Np1 -i "$srcdir/no_external_gettext.patch" - gtkdocize - autoreconf -fi - - cd po - intltool-update --pot - cd ../po-locations - intltool-update --gettext-package libgweather-locations --pot - cd .. - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-locations-compression - make -} - -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/libgweather/gettext-not-xml.patch b/gnome-unstable/libgweather/gettext-not-xml.patch deleted file mode 100644 index b966c5648..000000000 --- a/gnome-unstable/libgweather/gettext-not-xml.patch +++ /dev/null @@ -1,551 +0,0 @@ -Description: Switch to using gettext to find localized names for locations, instead of shipping very large locale-specific XML files with lots of duplicate information. -Author: ? - -only in patch2: -unchanged: -Index: libgweather-3.5.1/configure.ac -=================================================================== ---- libgweather-3.5.1.orig/configure.ac 2012-06-25 03:23:11.000000000 +1200 -+++ libgweather-3.5.1/configure.ac 2012-07-05 10:27:51.457384292 +1200 -@@ -46,6 +46,10 @@ - LT_INIT([dlopen win32-dll disable-static]) - LT_LIB_M - -+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations -+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) -+IT_PO_SUBDIR([po-locations]) -+ - PKG_PROG_PKG_CONFIG([0.19]) - - AC_PROG_CC -@@ -53,13 +57,6 @@ - - GLIB_GSETTINGS - --AC_ARG_ENABLE(all-translations-in-one-xml, -- [AS_HELP_STRING([--enable-all-translations-in-one-xml], -- [Put all translations in a big Locations.xml file (slow to parse)])], -- [enable_big_xml=yes], -- [enable_big_xml=no]) --AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") -- - AC_ARG_ENABLE(locations-compression, - [AS_HELP_STRING([--enable-locations-compression], - [Compress Locations.xml files])], -@@ -183,7 +180,7 @@ - Makefile - doc/Makefile - po/Makefile.in --po-locations/Makefile -+po-locations/Makefile.in - libgweather/Makefile - libgweather/gweather-3.0.pc - libgweather/gweather-3.0-uninstalled.pc -@@ -192,12 +189,6 @@ - ]) - AC_OUTPUT - --if test "x$enable_big_xml" = "xyes"; then -- LOCATIONS_XML_TRANSLATIONS="one big file" --else -- LOCATIONS_XML_TRANSLATIONS="one file per translation" --fi -- - dnl *************************************************************************** - dnl *** Display Summary *** - dnl *************************************************************************** -@@ -208,6 +199,4 @@ - Source code location: ${srcdir} - Compiler: ${CC} - Introspection support: ${found_introspection} -- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} -- Locations.xml compression: ${enable_locations_compression} - " >&2 -Index: libgweather-3.5.1/data/Makefile.am -=================================================================== ---- libgweather-3.5.1.orig/data/Makefile.am 2012-06-06 04:07:53.000000000 +1200 -+++ libgweather-3.5.1/data/Makefile.am 2012-07-05 10:27:51.461384292 +1200 -@@ -4,61 +4,21 @@ - libgweatherlocationsdir = $(pkgdatadir) - libgweatherlocations_in_files = Locations.xml.in - --if USE_ONE_BIG_XML -- --LOCATIONS_STAMP = -- --libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) -- --%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) -- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ -- fi -- --else # USE_ONE_BIG_XML -- - LOCATIONS_STAMP = stamp-Locations.xml - --PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) -- - # Helper variable --libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) -- --libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) -+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) - - # We need this step so that we merge all the make Locations.xy.xml destinations - # into one unique destination. This makes -j2 work. (Else, we end up with - # multiple and conflicting calls to intltool-merge) - $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) - --$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile -- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ -- for pofile in $(PO_LOCATIONS); do \ -- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ -- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ -- rm -f $$locale/$(libgweatherlocations_data); \ -- test -d $$locale && rmdir $$locale; \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.$$locale.xml; \ -- fi; \ -- done && \ -- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ -- rm -f C/$(libgweatherlocations_data) && \ -- test -d C && rmdir C && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.xml; \ -- fi && \ -- touch $@ -- --endif # USE_ONE_BIG_XML -- --### Locations.xml.in rebuild --rebuild-locations: locationdb.sqlite update-locations.py -- $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new -- --locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl -- $(AM_V_GEN)$(srcdir)/build-locationdb.pl -+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile -+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \ -+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \ -+ rm -f C/$(libgweatherlocations_DATA) && \ -+ touch $@ - - check: - xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in -Index: libgweather-3.5.1/libgweather/gweather-location.c -=================================================================== ---- libgweather-3.5.1.orig/libgweather/gweather-location.c 2012-06-15 08:15:23.000000000 +1200 -+++ libgweather-3.5.1/libgweather/gweather-location.c 2012-07-05 10:27:51.461384292 +1200 -@@ -22,11 +22,14 @@ - #include <config.h> - #endif - -+#include "config.h" -+ - #include <string.h> - #include <math.h> - #include <locale.h> - #include <gtk/gtk.h> - #include <libxml/xmlreader.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-location.h" -@@ -157,10 +160,20 @@ - - tagname = (const char *) xmlTextReaderConstName (parser->xml); - if (!strcmp (tagname, "name") && !loc->name) { -- value = gweather_parser_get_localized_value (parser); -+ char *context = NULL; -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ -+ value = gweather_parser_get_value (parser); - if (!value) - goto error_out; -- loc->name = g_strdup (value); -+ -+ if (context != NULL) { -+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); -+ xmlFree (context); -+ } -+ else -+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); -+ - xmlFree (value); - normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); - loc->sort_name = g_utf8_casefold (normalized, -1); -Index: libgweather-3.5.1/libgweather/gweather-timezone.c -=================================================================== ---- libgweather-3.5.1.orig/libgweather/gweather-timezone.c 2011-11-16 01:03:32.000000000 +1300 -+++ libgweather-3.5.1/libgweather/gweather-timezone.c 2012-07-05 10:27:51.461384292 +1200 -@@ -23,6 +23,7 @@ - #endif - - #include <string.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-timezone.h" -@@ -154,7 +155,7 @@ - parse_timezone (GWeatherParser *parser) - { - GWeatherTimezone *zone = NULL; -- char *id = NULL, *name = NULL; -+ char *id = NULL, *name = NULL, *context = NULL; - int offset = 0, dst_offset = 0; - gboolean has_dst = FALSE; - -@@ -177,27 +178,34 @@ - continue; - } - -- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) -- name = gweather_parser_get_localized_value (parser); -+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ name = gweather_parser_get_value (parser); -+ } - else { - if (xmlTextReaderNext (parser->xml) != 1) - break; - } - } - } -- -+ - if (parse_tzdata (id, parser->year_start, parser->year_end, - &offset, &has_dst, &dst_offset)) { - zone = g_slice_new0 (GWeatherTimezone); - zone->ref_count = 1; - zone->id = g_strdup (id); -- zone->name = g_strdup (name); -+ if (context != NULL) -+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); -+ else -+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); - zone->offset = offset; - zone->has_dst = has_dst; - zone->dst_offset = dst_offset; - } - - xmlFree (id); -+ if (context) -+ xmlFree (context); - if (name) - xmlFree (name); - -Index: libgweather-3.5.1/po-locations/LINGUAS -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgweather-3.5.1/po-locations/LINGUAS 2012-07-05 10:27:51.461384292 +1200 -@@ -0,0 +1,78 @@ -+ang -+ar -+as -+az -+be -+be@latin -+bg -+bn_IN -+bn -+bs -+ca -+cs -+cy -+da -+de -+dz -+el -+en_CA -+en_GB -+es -+et -+eu -+fa -+fi -+fr -+ga -+gl -+gu -+he -+hi -+hr -+hu -+id -+it -+ja -+ka -+kn -+ko -+ku -+ky -+lt -+lv -+mai -+mg -+mk -+ml -+mn -+mr -+ms -+nb -+ne -+nl -+nn -+oc -+or -+pa -+pl -+pt_BR -+pt -+ro -+ru -+rw -+si -+sk -+sl -+sq -+sr@latin -+sr -+sv -+ta -+te -+th -+tr -+uk -+vi -+zh_CN -+zh_HK -+zh_TW -Index: libgweather-3.5.1/po-locations/Makefile.in.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgweather-3.5.1/po-locations/Makefile.in.in 2012-07-05 10:27:51.461384292 +1200 -@@ -0,0 +1,217 @@ -+# Makefile for program source directory in GNU NLS utilities package. -+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> -+# -+# This file may be copied and used freely without restrictions. It may -+# be used in projects which are not available under a GNU Public License, -+# but which still want to provide support for the GNU gettext functionality. -+# -+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE -+# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -+# -+# - Modified by jacob berkman <jacob@ximian.com> to install -+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -+# -+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool -+# -+# We have the following line for use by intltoolize: -+# INTLTOOL_MAKEFILE -+ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+libdir = @libdir@ -+DATADIRNAME = @DATADIRNAME@ -+itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+subdir = po-locations -+install_sh = @install_sh@ -+# Automake >= 1.8 provides @mkdir_p@. -+# Until it can be supposed, use the safe fallback: -+mkdir_p = $(install_sh) -d -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+GMSGFMT = @GMSGFMT@ -+MSGFMT = @MSGFMT@ -+XGETTEXT = @XGETTEXT@ -+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -+ -+ALL_LINGUAS = @ALL_LINGUAS@ -+ -+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -+ -+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) -+ -+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -+ -+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -+ -+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS -+ -+POTFILES = \ -+# This comment gets stripped out -+ -+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) -+ -+.SUFFIXES: -+.SUFFIXES: .po .pox .gmo .mo .msg .cat -+ -+.po.pox: -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox -+ -+.po.mo: -+ $(MSGFMT) -o $@ $< -+ -+.po.gmo: -+ file=`echo $* | sed 's,.*/,,'`.gmo \ -+ && rm -f $$file && $(GMSGFMT) -o $$file $< -+ -+.po.cat: -+ sed -f ../intl/po2msg.sed < $< > $*.msg \ -+ && rm -f $@ && gencat $@ $*.msg -+ -+ -+all: all-@USE_NLS@ -+ -+all-yes: $(CATALOGS) -+all-no: -+ -+$(GETTEXT_PACKAGE).pot: $(POTFILES) -+ $(GENPOT) -+ -+install: install-data -+install-data: install-data-@USE_NLS@ -+install-data-no: all -+install-data-yes: all -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $$dir; \ -+ if test -r $$lang.gmo; then \ -+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ -+ else \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $(srcdir)/$$lang.gmo as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo"; \ -+ fi; \ -+ if test -r $$lang.gmo.m; then \ -+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ if test -r $(srcdir)/$$lang.gmo.m ; then \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ -+ $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $(srcdir)/$$lang.gmo.m as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ true; \ -+ fi; \ -+ fi; \ -+ done -+ -+# Empty stubs to satisfy archaic automake needs -+dvi info tags TAGS ID: -+ -+# Define this as empty until I found a useful application. -+install-exec installcheck: -+ -+uninstall: -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ -+ done -+ -+check: all $(GETTEXT_PACKAGE).pot -+ rm -f missing notexist -+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m -+ if [ -r missing -o -r notexist ]; then \ -+ exit 1; \ -+ fi -+ -+mostlyclean: -+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp -+ rm -f .intltool-merge-cache -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES stamp-it -+ rm -f *.mo *.msg *.cat *.cat.m *.gmo -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f Makefile.in.in -+ -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ extra_dists="$(EXTRA_DISTFILES)"; \ -+ for file in $$extra_dists; do \ -+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ -+ done; \ -+ for file in $$dists; do \ -+ test -f $$file || file="$(srcdir)/$$file"; \ -+ ln $$file $(distdir) 2> /dev/null \ -+ || cp -p $$file $(distdir); \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ tmpdir=`pwd`; \ -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ echo "$$lang:"; \ -+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ -+ if $$result; then \ -+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$lang.gmo failed!"; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi; \ -+ done -+ -+Makefile POTFILES: stamp-it -+ @if test ! -f $@; then \ -+ rm -f stamp-it; \ -+ $(MAKE) stamp-it; \ -+ fi -+ -+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in -+ cd $(top_builddir) \ -+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ -+ $(SHELL) ./config.status -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -Index: libgweather-3.5.1/po-locations/POTFILES.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libgweather-3.5.1/po-locations/POTFILES.in 2012-07-05 10:27:51.461384292 +1200 -@@ -0,0 +1,4 @@ -+# This list should contain *only* data/Locations.xml.in. -+# Everything else should be in POTFILES.skip. -+[encoding:UTF-8] -+data/Locations.xml.in diff --git a/gnome-unstable/libgweather/libgweather.install b/gnome-unstable/libgweather/libgweather.install deleted file mode 100644 index 3ba0d0a48..000000000 --- a/gnome-unstable/libgweather/libgweather.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/gnome - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/libgweather.schemas ]; then - gconfpkg --uninstall libgweather - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/libgweather/no_external_gettext.patch b/gnome-unstable/libgweather/no_external_gettext.patch deleted file mode 100644 index 64b3c5ad5..000000000 --- a/gnome-unstable/libgweather/no_external_gettext.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libgweather-3.5.1/configure.ac -=================================================================== ---- libgweather-3.5.1.orig/configure.ac 2012-07-05 10:33:10.277373254 +1200 -+++ libgweather-3.5.1/configure.ac 2012-07-05 10:33:44.957372053 +1200 -@@ -97,9 +97,6 @@ - dnl gettext - IT_PROG_INTLTOOL([0.50.0]) - --AM_GNU_GETTEXT_VERSION([0.18]) --AM_GNU_GETTEXT([external]) -- - GETTEXT_PACKAGE=libgweather-3.0 - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package]) diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD deleted file mode 100644 index 3c653cb3b..000000000 --- a/gnome-unstable/libpeas/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 166436 2012-09-07 19:19:46Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=libpeas -pkgver=1.5.0 -pkgrel=1 -pkgdesc="A GObject-based plugins engine" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') -makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade') -optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' - 'seed: gobject-based plugin engine - seed runtime loader') -options=('!libtool') -install=libpeas.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('f5ccc0f4e0b24db273d5e11d161494a6751dd2178813b9d98832dac0a049b0bb') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/libpeas/libpeas.install b/gnome-unstable/libpeas/libpeas.install deleted file mode 100644 index 1a05f573e..000000000 --- a/gnome-unstable/libpeas/libpeas.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/libsecret/PKGBUILD b/gnome-unstable/libsecret/PKGBUILD deleted file mode 100644 index 1ec9f5695..000000000 --- a/gnome-unstable/libsecret/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libsecret -pkgver=0.10 -pkgrel=1 -pkgdesc='library for storing and retrieving passwords and other secrets.' -arch=('i686' 'x86_64') -license=('LGPL') -url="https://live.gnome.org/Libsecret" -depends=('glib2' 'libgcrypt') -makedepends=('intltool' 'docbook-xsl') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD deleted file mode 100644 index f8816eff0..000000000 --- a/gnome-unstable/libsoup/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 166821 2012-09-19 16:12:42Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libsoup -pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.39.92 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -options=('!libtool' '!emptydirs') -sha256sums=('1401b35f977cae8bd4b6d1de1e560045831276e819d6091c1e34dcb1dd69ad0a') - -build() { - cd "$pkgbase-$pkgver" - sed -i -e 's/env python/python2/' libsoup/tld-parser.py - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package_libsoup() { - pkgdesc="GNOME HTTP Library - base library" - depends=('glib2' 'libxml2' 'glib-networking') - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - - rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.* - rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" - rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4" - rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" -} - -package_libsoup-gnome() { - pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite') - - cd "$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install - - rm -f "$pkgdir"/usr/lib/libsoup-2.4.* - rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc" - rm -rf "$pkgdir/usr/include/libsoup-2.4" - rm -rf "$pkgdir/usr/share" - rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib" -} diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD deleted file mode 100644 index b2f689f1f..000000000 --- a/gnome-unstable/mutter/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 166811 2012-09-19 14:53:55Z jgc $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Michael Kanis <mkanis_at_gmx_dot_de> - -pkgname=mutter -pkgver=3.5.92 -pkgrel=1 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity') -makedepends=('intltool' 'gnome-doc-utils') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0b745e25ae5243eb98f7b19adb7fd596c75d40d318a1b1288be0b6ecd8f3f825') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/mutter \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/mutter/mutter.install b/gnome-unstable/mutter/mutter.install deleted file mode 100644 index c47f1cef2..000000000 --- a/gnome-unstable/mutter/mutter.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=mutter - -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then - /usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/nautilus/PKGBUILD b/gnome-unstable/nautilus/PKGBUILD deleted file mode 100644 index 8795d9837..000000000 --- a/gnome-unstable/nautilus/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 166504 2012-09-08 13:07:20Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nautilus -pkgver=3.5.91 -pkgrel=1 -pkgdesc="GNOME file manager" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') -makedepends=('intltool' 'gobject-introspection') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0fe4b31a27ee1b172d6c948fedcfc2f8b3dd09da035e317b53c6fa2a96c7abc0') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/nautilus \ - --disable-nst-extension \ - --disable-update-mimedb \ - --disable-packagekit \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/nautilus/nautilus.install b/gnome-unstable/nautilus/nautilus.install deleted file mode 100644 index 082126d24..000000000 --- a/gnome-unstable/nautilus/nautilus.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-mime-database /usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/pango/PKGBUILD b/gnome-unstable/pango/PKGBUILD deleted file mode 100644 index 0826ef16b..000000000 --- a/gnome-unstable/pango/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 166307 2012-09-05 21:16:30Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pango -pkgver=1.31.1 -pkgrel=1 -pkgdesc="A library for layout and rendering of text" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('libthai' 'cairo' 'libxft' 'harfbuzz') -makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection') -options=('!libtool') -install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -url="http://www.pango.org/" -sha256sums=('b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-included-modules=basic-fc - make -} - -package() { - cd ${pkgname}-${pkgver} - make -j1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/pango" -} diff --git a/gnome-unstable/pango/pango.install b/gnome-unstable/pango/pango.install deleted file mode 100644 index 73b0f5bf1..000000000 --- a/gnome-unstable/pango/pango.install +++ /dev/null @@ -1,21 +0,0 @@ -# arg 1: the new package version -post_install() { - # we need to ldconfig first, in case xfree86's libs aren't - # in ld.so.cache yet - sbin/ldconfig -r . - usr/bin/pango-querymodules >etc/pango/pango.modules -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ -f usr/etc/pango/pango.modules ]; then - rm usr/etc/pango/pango.modules - fi - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - rm etc/pango/pango.modules -} diff --git a/gnome-unstable/polkit/PKGBUILD b/gnome-unstable/polkit/PKGBUILD deleted file mode 100644 index 08a25c91b..000000000 --- a/gnome-unstable/polkit/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 166703 2012-09-16 00:14:29Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=polkit -pkgver=0.107 -pkgrel=3 -pkgdesc="Application development toolkit for controlling system-wide privileges" -arch=(i686 x86_64) -license=('LGPL') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" -depends=('glib2' 'pam' 'expat' 'libsystemd' 'js') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') -replaces=('policykit') -options=('!libtool') -install=polkit.install -source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz - polkit.pam) -md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1' - '6564f95878297b954f0572bc1610dd15') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static --enable-gtk-doc - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - chown 102 "$pkgdir/etc/polkit-1/rules.d" - chown 102 "$pkgdir/usr/share/polkit-1/rules.d" - - install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" -} diff --git a/gnome-unstable/polkit/autogen.sh b/gnome-unstable/polkit/autogen.sh deleted file mode 100755 index d08b00a49..000000000 --- a/gnome-unstable/polkit/autogen.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -DIE=0 - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory $srcdir does not look like the" - echo " top-level package directory" - exit 1 -} - -olddir=`pwd` -cd "$srcdir" - -touch ChangeLog - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have autoconf installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && { - (libtoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have libtool installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - } -} - -(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have gtk-doc installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have automake installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing aclocal. The version of automake" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - - -# if no automake, don't bother testing for autoreconf -test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have autoreconf installed." - echo "You can get autoreconf from ..." - DIE=1 -} - - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run configure with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo $0 " command line." - echo -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - - aclocalinclude="$ACLOCAL_FLAGS" - - echo "Running autoreconf on test/mocklibc ..." - (cd "test/mocklibc"; autoreconf --install) - - if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu -Wno-portability $am_opt ..." - automake --add-missing --gnu -Wno-portability $am_opt - echo "Running autoconf ..." - autoconf - -intltoolize --copy --force --automake || exit 1 - -cd "$olddir" - -conf_flags="--enable-maintainer-mode --enable-gtk-doc" - -if test x$NOCONFIGURE = x; then - echo "Running $srcdir/configure $conf_flags $@ ..." - $srcdir/configure $conf_flags "$@" \ - && echo "Now type make to compile." || exit 1 -else - echo "Skipping configure process." -fi diff --git a/gnome-unstable/polkit/logind+ConsoleKit.patch b/gnome-unstable/polkit/logind+ConsoleKit.patch deleted file mode 100644 index 042d1043a..000000000 --- a/gnome-unstable/polkit/logind+ConsoleKit.patch +++ /dev/null @@ -1,638 +0,0 @@ -From ba143769e17e4bbc1f2b0c88e735f993dfb3c873 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Tue, 7 Aug 2012 21:06:18 +0200 -Subject: [PATCH] session tracking: always require consolekit - -Only systemd is now optional at compile-time, and if enabled we fallback to consolekit -at runtime, if not booted with systemd. - -Bits-stolen-from: Jan Alexander Steffens <jan.steffens@gmail.com> -Signed-off-by: Tom Gundersen <teg@jklm.no> ---- - configure.ac | 6 +- - src/polkit/polkitunixsession-systemd.c | 96 ++++++- - src/polkitbackend/polkitbackendjsauthority.c | 10 +- - .../polkitbackendsessionmonitor-systemd.c | 313 +++++++++++++++++++-- - 4 files changed, 380 insertions(+), 45 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a0d938..1d1e4ba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -163,15 +163,15 @@ AC_ARG_ENABLE([libsystemd-login], - [enable_libsystemd_login=auto]) - if test "$enable_libsystemd_login" != "no"; then - PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, -- [libsystemd-login], -+ [libsystemd-login libsystemd-daemon], - have_libsystemd_login=yes, - have_libsystemd_login=no) - if test "$have_libsystemd_login" = "yes"; then -- SESSION_TRACKING=libsystemd-login -+ SESSION_TRACKING="libsystemd-login (with ConsoleKit runtime fallback)" - AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) - else - if test "$enable_libsystemd_login" = "yes"; then -- AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found]) -+ AC_MSG_ERROR([libsystemd-login support requested but systemd libraries not found]) - fi - fi - fi -diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c -index 8a8bf65..bb89044 100644 ---- a/src/polkit/polkitunixsession-systemd.c -+++ b/src/polkit/polkitunixsession-systemd.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2011 Red Hat, Inc. -+ * Copyright (C) 2008, 2011 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -17,6 +17,7 @@ - * Boston, MA 02111-1307, USA. - * - * Author: Matthias Clasen -+ * Author: David Zeuthen <davidz@redhat.com> - */ - - #ifdef HAVE_CONFIG_H -@@ -31,6 +32,7 @@ - #include "polkitprivate.h" - - #include <systemd/sd-login.h> -+#include <systemd/sd-daemon.h> - - /** - * SECTION:polkitunixsession -@@ -367,9 +369,41 @@ polkit_unix_session_exists_sync (PolkitSubject *subject, - PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); - gboolean ret = FALSE; - uid_t uid; -+ GDBusConnection *connection; /* consolekit */ -+ GVariant *result; /* consolekit */ - -- if (sd_session_get_uid (session->session_id, &uid) == 0) -- ret = TRUE; -+ if (sd_booted()) -+ { -+ if (sd_session_get_uid (session->session_id, &uid) == 0) -+ ret = TRUE; -+ } -+ else /* consolekit */ -+ { -+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -+ if (connection == NULL) -+ goto out; -+ -+ result = g_dbus_connection_call_sync (connection, -+ "org.freedesktop.ConsoleKit", /* name */ -+ session->session_id, /* object path */ -+ "org.freedesktop.ConsoleKit.Session", /* interface name */ -+ "GetUser", /* method */ -+ NULL, /* parameters */ -+ G_VARIANT_TYPE ("(u)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ cancellable, -+ error); -+ if (result == NULL) -+ goto out; -+ -+ ret = TRUE; -+ g_variant_unref (result); -+ -+ out: -+ if (connection != NULL) -+ g_object_unref (connection); -+ } - - return ret; - } -@@ -451,29 +485,61 @@ polkit_unix_session_initable_init (GInitable *initable, - PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); - gboolean ret = FALSE; - char *s; -+ GDBusConnection *connection; /* consolekit */ -+ GVariant *result; /* consolekit */ -+ connection = NULL; /* consolekit */ - - if (session->session_id != NULL) - { - /* already set, nothing to do */ -- ret = TRUE; -- goto out; -+ return TRUE; - } - -- if (sd_pid_get_session (session->pid, &s) == 0) -+ if (sd_booted()) -+ { -+ if (sd_pid_get_session (session->pid, &s) == 0) -+ { -+ session->session_id = g_strdup (s); -+ free (s); -+ return TRUE; -+ } -+ -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "No session for pid %d", -+ (gint) session->pid); -+ } -+ else /* consolekit */ - { -- session->session_id = g_strdup (s); -- free (s); -+ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); -+ if (connection == NULL) -+ goto out; -+ -+ result = g_dbus_connection_call_sync (connection, -+ "org.freedesktop.ConsoleKit", /* name */ -+ "/org/freedesktop/ConsoleKit/Manager", /* object path */ -+ "org.freedesktop.ConsoleKit.Manager", /* interface name */ -+ "GetSessionForUnixProcess", /* method */ -+ g_variant_new ("(u)", session->pid), /* parameters */ -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ cancellable, -+ error); -+ if (result == NULL) -+ goto out; -+ -+ g_variant_get (result, "(o)", &session->session_id); -+ g_variant_unref (result); -+ - ret = TRUE; -- goto out; - } - -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "No session for pid %d", -- (gint) session->pid); -+ out: -+ if (connection != NULL) /* consolekit */ -+ g_object_unref (connection); - --out: - return ret; - } - -diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c -index bdfaa73..ee38739 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.c -+++ b/src/polkitbackend/polkitbackendjsauthority.c -@@ -36,6 +36,7 @@ - - #ifdef HAVE_LIBSYSTEMD_LOGIN - #include <systemd/sd-login.h> -+#include <systemd/sd-daemon.h> - #endif /* HAVE_LIBSYSTEMD_LOGIN */ - - #include <jsapi.h> -@@ -731,11 +732,14 @@ subject_to_jsval (PolkitBackendJsAuthority *authority, - } - - #ifdef HAVE_LIBSYSTEMD_LOGIN -- if (sd_pid_get_session (pid, &session_str) == 0) -+ if (sd_booted()) - { -- if (sd_session_get_seat (session_str, &seat_str) == 0) -+ if (sd_pid_get_session (pid, &session_str) == 0) - { -- /* do nothing */ -+ if (sd_session_get_seat (session_str, &seat_str) == 0) -+ { -+ /* do nothing */ -+ } - } - } - #endif /* HAVE_LIBSYSTEMD_LOGIN */ -diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c -index 58593c3..5114dfa 100644 ---- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c -+++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c -@@ -26,11 +26,15 @@ - #include <string.h> - #include <glib/gstdio.h> - #include <systemd/sd-login.h> -+#include <systemd/sd-daemon.h> - #include <stdlib.h> - - #include <polkit/polkit.h> - #include "polkitbackendsessionmonitor.h" - -+/* consolekit */ -+#define CKDB_PATH "/var/run/ConsoleKit/database" -+ - /* <internal> - * SECTION:polkitbackendsessionmonitor - * @title: PolkitBackendSessionMonitor -@@ -126,6 +130,11 @@ struct _PolkitBackendSessionMonitor - GDBusConnection *system_bus; - - GSource *sd_source; -+ -+ /* consolekit */ -+ GKeyFile *database; -+ GFileMonitor *database_monitor; -+ time_t database_mtime; - }; - - struct _PolkitBackendSessionMonitorClass -@@ -148,6 +157,101 @@ G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TY - - /* ---------------------------------------------------------------------------------------------------- */ - -+/* consolekit */ -+static gboolean -+reload_database (PolkitBackendSessionMonitor *monitor, -+ GError **error) -+{ -+ gboolean ret; -+ struct stat statbuf; -+ -+ ret = FALSE; -+ -+ if (monitor->database != NULL) -+ { -+ g_key_file_free (monitor->database); -+ monitor->database = NULL; -+ } -+ -+ if (stat (CKDB_PATH, &statbuf) != 0) -+ { -+ g_set_error (error, -+ G_IO_ERROR, -+ g_io_error_from_errno (errno), -+ "Error statting file " CKDB_PATH ": %s", -+ strerror (errno)); -+ goto out; -+ } -+ -+ monitor->database_mtime = statbuf.st_mtime; -+ -+ monitor->database = g_key_file_new (); -+ if (!g_key_file_load_from_file (monitor->database, -+ CKDB_PATH, -+ G_KEY_FILE_NONE, -+ error)) -+ { -+ goto out; -+ } -+ -+ ret = TRUE; -+ -+ out: -+ return ret; -+} -+ -+static gboolean -+ensure_database (PolkitBackendSessionMonitor *monitor, -+ GError **error) -+{ -+ gboolean ret = FALSE; -+ -+ if (monitor->database != NULL) -+ { -+ struct stat statbuf; -+ -+ if (stat (CKDB_PATH, &statbuf) != 0) -+ { -+ g_set_error (error, -+ G_IO_ERROR, -+ g_io_error_from_errno (errno), -+ "Error statting file " CKDB_PATH " to check timestamp: %s", -+ strerror (errno)); -+ goto out; -+ } -+ if (statbuf.st_mtime == monitor->database_mtime) -+ { -+ ret = TRUE; -+ goto out; -+ } -+ } -+ -+ ret = reload_database (monitor, error); -+ -+ out: -+ return ret; -+} -+ -+static void -+on_file_monitor_changed (GFileMonitor *file_monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data) -+{ -+ PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); -+ -+ /* throw away cache */ -+ if (monitor->database != NULL) -+ { -+ g_key_file_free (monitor->database); -+ monitor->database = NULL; -+ } -+ g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); -+} -+ -+/* consolekit - end */ -+ - static gboolean - sessions_changed (gpointer user_data) - { -@@ -163,6 +267,7 @@ static void - polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) - { - GError *error; -+ GFile *file; /* consolekit */ - - error = NULL; - monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -@@ -172,9 +277,41 @@ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) - g_error_free (error); - } - -- monitor->sd_source = sd_source_new (); -- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -- g_source_attach (monitor->sd_source, NULL); -+ if (sd_booted()) -+ { -+ monitor->sd_source = sd_source_new (); -+ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); -+ g_source_attach (monitor->sd_source, NULL); -+ } -+ else /* consolekit */ -+ { -+ error = NULL; -+ if (!ensure_database (monitor, &error)) -+ { -+ g_printerr ("Error loading " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } -+ -+ error = NULL; -+ file = g_file_new_for_path (CKDB_PATH); -+ monitor->database_monitor = g_file_monitor_file (file, -+ G_FILE_MONITOR_NONE, -+ NULL, -+ &error); -+ g_object_unref (file); -+ if (monitor->database_monitor == NULL) -+ { -+ g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); -+ g_error_free (error); -+ } -+ else -+ { -+ g_signal_connect (monitor->database_monitor, -+ "changed", -+ G_CALLBACK (on_file_monitor_changed), -+ monitor); -+ } -+ } - } - - static void -@@ -191,6 +328,14 @@ polkit_backend_session_monitor_finalize (GObject *object) - g_source_unref (monitor->sd_source); - } - -+ /* consolekit */ -+ if (monitor->database_monitor != NULL) -+ g_object_unref (monitor->database_monitor); -+ -+ if (monitor->database != NULL) -+ g_key_file_free (monitor->database); -+ /* consolekit - end */ -+ - if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL) - G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object); - } -@@ -258,6 +403,8 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor - GError **error) - { - PolkitIdentity *ret; -+ GError *local_error; /* consolekit */ -+ gchar *group; /* consolekit */ - guint32 uid; - - ret = NULL; -@@ -300,16 +447,38 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor - else if (POLKIT_IS_UNIX_SESSION (subject)) - { - -- if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) -+ if (sd_booted()) - { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Error getting uid for session"); -- goto out; -+ if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Error getting uid for session"); -+ goto out; -+ } -+ -+ ret = polkit_unix_user_new (uid); -+ } -+ else /* consolekit */ -+ { -+ if (!ensure_database (monitor, error)) -+ { -+ g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); -+ goto out; -+ } -+ -+ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); -+ local_error = NULL; -+ uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); -+ if (local_error != NULL) -+ { -+ g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); -+ g_free (group); -+ goto out; -+ } -+ g_free (group); - } -- -- ret = polkit_unix_user_new (uid); - } - - out: -@@ -337,20 +506,43 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni - - if (POLKIT_IS_UNIX_PROCESS (subject)) - { -- gchar *session_id; -- pid_t pid; -+ if (sd_booted()) -+ { -+ gchar *session_id; -+ pid_t pid; - -- pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -- if (sd_pid_get_session (pid, &session_id) < 0) -- goto out; -+ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); -+ if (sd_pid_get_session (pid, &session_id) < 0) -+ goto out; - -- session = polkit_unix_session_new (session_id); -- free (session_id); -+ session = polkit_unix_session_new (session_id); -+ free (session_id); -+ } -+ else /* consolekit */ -+ { -+ const gchar *session_id; -+ GVariant *result; -+ result = g_dbus_connection_call_sync (monitor->system_bus, -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ "GetSessionForUnixProcess", -+ g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, /* timeout_msec */ -+ NULL, /* GCancellable */ -+ error); -+ if (result == NULL) -+ goto out; -+ g_variant_get (result, "(&o)", &session_id); -+ session = polkit_unix_session_new (session_id); -+ g_variant_unref (result); -+ } - } - else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) - { - guint32 pid; -- gchar *session_id; - GVariant *result; - - result = g_dbus_connection_call_sync (monitor->system_bus, -@@ -369,11 +561,35 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni - g_variant_get (result, "(u)", &pid); - g_variant_unref (result); - -- if (sd_pid_get_session (pid, &session_id) < 0) -- goto out; -+ if (sd_booted()) -+ { -+ gchar *session_id; -+ if (sd_pid_get_session (pid, &session_id) < 0) -+ goto out; - -- session = polkit_unix_session_new (session_id); -- free (session_id); -+ session = polkit_unix_session_new (session_id); -+ free (session_id); -+ } -+ else /* consolekit */ -+ { -+ const gchar *session_id; -+ result = g_dbus_connection_call_sync (monitor->system_bus, -+ "org.freedesktop.ConsoleKit", -+ "/org/freedesktop/ConsoleKit/Manager", -+ "org.freedesktop.ConsoleKit.Manager", -+ "GetSessionForUnixProcess", -+ g_variant_new ("(u)", pid), -+ G_VARIANT_TYPE ("(o)"), -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, /* timeout_msec */ -+ NULL, /* GCancellable */ -+ error); -+ if (result == NULL) -+ goto out; -+ g_variant_get (result, "(&o)", &session_id); -+ session = polkit_unix_session_new (session_id); -+ g_variant_unref (result); -+ } - } - else - { -@@ -389,12 +605,58 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni - return session; - } - -+static gboolean -+get_boolean (PolkitBackendSessionMonitor *monitor, -+ PolkitSubject *session, -+ const gchar *key_name) -+{ -+ gboolean ret; -+ gchar *group; -+ GError *error; -+ -+ ret = FALSE; -+ -+ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); -+ -+ error = NULL; -+ if (!ensure_database (monitor, &error)) -+ { -+ g_printerr ("Error getting boolean `%s' in group `%s': Error ensuring CK database at " CKDB_PATH ": %s", -+ key_name, -+ group, -+ error->message); -+ g_error_free (error); -+ goto out; -+ } -+ -+ error = NULL; -+ ret = g_key_file_get_boolean (monitor->database, group, key_name, &error); -+ if (error != NULL) -+ { -+ g_printerr ("Error looking %s using " CKDB_PATH " for %s: %s\n", -+ key_name, -+ group, -+ error->message); -+ g_error_free (error); -+ goto out; -+ } -+ -+ out: -+ g_free (group); -+ return ret; -+} -+ - gboolean - polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, - PolkitSubject *session) - { - char *seat; - -+ if (!sd_booted()) /* consolekit */ -+ { -+ return get_boolean (monitor, session, "is_local"); -+ } -+ - if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) - { - free (seat); -@@ -409,6 +671,9 @@ gboolean - polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, - PolkitSubject *session) - { -- return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); -+ if (sd_booted()) -+ return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); -+ else /* consolekit */ -+ return get_boolean (monitor, session, "is_active"); - } - --- -1.7.11.4 - diff --git a/gnome-unstable/polkit/polkit.install b/gnome-unstable/polkit/polkit.install deleted file mode 100644 index fbb98919e..000000000 --- a/gnome-unstable/polkit/polkit.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - getent group polkitd >/dev/null || groupadd -g 102 polkitd - getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd - passwd -l polkitd &>/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - if getent passwd polkitd >/dev/null; then - userdel polkitd - fi - if getent group polkitd >/dev/null; then - groupdel polkitd - fi -} diff --git a/gnome-unstable/polkit/polkit.pam b/gnome-unstable/polkit/polkit.pam deleted file mode 100644 index 04f53e0db..000000000 --- a/gnome-unstable/polkit/polkit.pam +++ /dev/null @@ -1,7 +0,0 @@ -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so diff --git a/gnome-unstable/rest/PKGBUILD b/gnome-unstable/rest/PKGBUILD deleted file mode 100644 index 16f5b5e63..000000000 --- a/gnome-unstable/rest/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 166595 2012-09-12 18:10:17Z jgc $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=rest -pkgver=0.7.90 -pkgrel=1 -pkgdesc="A helper library for RESTful services." -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libxml2' 'libsoup-gnome') -makedepends=('gobject-introspection') -options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/telepathy-glib/PKGBUILD b/gnome-unstable/telepathy-glib/PKGBUILD deleted file mode 100644 index 9df1c51b1..000000000 --- a/gnome-unstable/telepathy-glib/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 166856 2012-09-19 22:53:47Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com -# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> - -pkgname=telepathy-glib -pkgver=0.19.9 -pkgrel=1 -pkgdesc="GLib bindings for the Telepathy D-Bus protocol" -arch=('i686' 'x86_64') -url="http://telepathy.freedesktop.org" -license=('LGPL2.1') -options=('!libtool' '!emptydirs') -depends=('dbus-glib') -makedepends=('libxslt' 'vala' 'gobject-introspection') -source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('b1eaad97c9a83df4b364cad468261220') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy \ - --enable-vala-bindings \ - --enable-static=no - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/udisks2/PKGBUILD b/gnome-unstable/udisks2/PKGBUILD deleted file mode 100644 index 04b21537f..000000000 --- a/gnome-unstable/udisks2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 166493 2012-09-08 11:04:55Z jgc $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=udisks2 -pkgver=1.99.0 -pkgrel=1 -pkgdesc="Disk Management Service, version 2" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL2') -depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') -optdepends=('parted: partition management' - 'gptfdisk: GUID partition table support') -options=(!libtool) -source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) -sha256sums=('f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176') - -build() { - cd "udisks-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "udisks-$pkgver" - make DESTDIR="$pkgdir" install \ - bash_completiondir=/usr/share/bash-completion/completions -} diff --git a/gnome-unstable/vala/PKGBUILD b/gnome-unstable/vala/PKGBUILD deleted file mode 100644 index 0d7dd2279..000000000 --- a/gnome-unstable/vala/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 166430 2012-09-07 18:23:02Z jgc $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Timm Preetz <timm@preetz.us> - -pkgname=vala -pkgver=0.17.6 -pkgrel=1 -pkgdesc="Compiler for the GObject type system" -arch=('i686' 'x86_64') -url="http://live.gnome.org/Vala" -license=('LGPL') -depends=('glib2') -makedepends=('libxslt') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('79bfa454813c22ca9eb0864a77bf51764e8944dc02c7e4b301feb45d782e2e25') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --enable-vapigen - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/gnome-unstable/webkitgtk3/PKGBUILD b/gnome-unstable/webkitgtk3/PKGBUILD deleted file mode 100644 index a0f9adec7..000000000 --- a/gnome-unstable/webkitgtk3/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=webkitgtk3 -pkgver=1.9.92 -pkgrel=1 -pkgdesc="GTK+ Web content engine library for GTK+ 3.0" -arch=('i686' 'x86_64') -url="http://webkitgtk.org/" -license=('custom') -depends=('libxt' 'libxslt' 'sqlite' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3') -makedepends=('gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') -conflicts=('libwebkit3') -provides=("libwebkit3=${pkgver}") -replaces=('libwebkit3') -options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz) -sha256sums=('27d28eb721ae4aae2d66e32eda4c11cc3ced53372e74da9ce0e1adc9857fbc22') - -build() { - cd "$srcdir/webkit-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk3 - make all stamp-po -} - -package() { - cd "$srcdir/webkit-$pkgver" - make -j1 DESTDIR="$pkgdir" install - install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/multilib-testing/lib32-util-linux/PKGBUILD b/multilib-testing/lib32-util-linux/PKGBUILD deleted file mode 100644 index 704327be8..000000000 --- a/multilib-testing/lib32-util-linux/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 75896 2012-09-05 04:43:08Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -_pkgbasename=util-linux -pkgname=lib32-$_pkgbasename -pkgver=2.22 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux (32-bit)" -url='http://www.kernel.org/pub/linux/utils/util-linux/' -arch=('x86_64') -depends=('lib32-glibc' "$_pkgbasename") -makedepends=('gcc-multilib') -provides=('lib32-util-linux-ng') -conflicts=('lib32-util-linux-ng') -replaces=('lib32-util-linux-ng') -license=('GPL2') -options=('!libtool' '!emptydirs') -source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v$pkgver/util-linux-$pkgver.tar.xz") -md5sums=('ba2d8cc12a937231c80a04f7f7149303') - -shopt -s extglob - -build() { - cd "$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --without-ncurses --libdir=/usr/lib32 - - make lib{uuid,blkid,mount}.la -} - -package() { - make -C "$_pkgbasename-$pkgver" \ - DESTDIR="$pkgdir" \ - install-usrlib_execLTLIBRARIES \ - install-pkgconfigDATA -} diff --git a/multilib/lib32-sdl/libsdl-1.2.15-resizing.patch b/multilib/lib32-sdl/libsdl-1.2.15-resizing.patch deleted file mode 100644 index 0655a13e1..000000000 --- a/multilib/lib32-sdl/libsdl-1.2.15-resizing.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Revert change that breaks window corner resizing - http://bugzilla.libsdl.org/show_bug.cgi?id=1430 -Author: Andrew Caudwell <acaudwell@gmail.com> -Last-Update: 2012-04-10 -Bug-Debian: http://bugs.debian.org/665779 - -diff -r c787fb1b5699 src/video/x11/SDL_x11events.c ---- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 -@@ -57,12 +57,6 @@ - static SDLKey MISC_keymap[256]; - SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); - --/* -- Pending resize target for ConfigureNotify (so outdated events don't -- cause inappropriate resize events) --*/ --int X11_PendingConfigureNotifyWidth = -1; --int X11_PendingConfigureNotifyHeight = -1; - - #ifdef X_HAVE_UTF8_STRING - Uint32 Utf8ToUcs4(const Uint8 *utf8) -@@ -825,16 +819,6 @@ - #ifdef DEBUG_XEVENTS - printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); - #endif -- if ((X11_PendingConfigureNotifyWidth != -1) && -- (X11_PendingConfigureNotifyHeight != -1)) { -- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && -- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { -- /* Event is from before the resize, so ignore. */ -- break; -- } -- X11_PendingConfigureNotifyWidth = -1; -- X11_PendingConfigureNotifyHeight = -1; -- } - if ( SDL_VideoSurface ) { - if ((xevent.xconfigure.width != SDL_VideoSurface->w) || - (xevent.xconfigure.height != SDL_VideoSurface->h)) { -diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h ---- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 -@@ -27,8 +27,3 @@ - extern void X11_InitOSKeymap(_THIS); - extern void X11_PumpEvents(_THIS); - extern void X11_SetKeyboardState(Display *display, const char *key_vec); -- --/* Variables to be exported */ --extern int X11_PendingConfigureNotifyWidth; --extern int X11_PendingConfigureNotifyHeight; -- -diff -r c787fb1b5699 src/video/x11/SDL_x11video.c ---- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 -+++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 -@@ -1182,8 +1182,6 @@ - current = NULL; - goto done; - } -- X11_PendingConfigureNotifyWidth = width; -- X11_PendingConfigureNotifyHeight = height; - } else { - if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { - current = NULL; diff --git a/multilib/lib32-sqlite/PKGBUILD b/multilib/lib32-sqlite/PKGBUILD deleted file mode 100644 index fce5a8978..000000000 --- a/multilib/lib32-sqlite/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Biru Ionut <ionut@archlinux.ro> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -# Contributor: Kaos < gianlucaatlas dot gmail dot com > - -_pkgbasename=sqlite -pkgname=lib32-sqlite -_amalgamationver=3071400 -pkgver=3.7.14 -pkgrel=2 -pkgdesc="A C library that implements an SQL database engine (32-bit)" -arch=('x86_64') -license=('custom') -url="http://www.sqlite.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=('tcl' 'gcc-multilib' 'lib32-readline') -source=(http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz) -options=(!libtool) -md5sums=('6464d429b1396a8db35864e791673b65') -provides=("lib32-sqlite3=$pkgver") -replaces=("lib32-sqlite3") -conflicts=("lib32-sqlite3") - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/sqlite-autoconf-${_amalgamationver} - export LTLINK_EXTRAS="-ldl" - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-threadsafe \ - --disable-static - - # rpath removal - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - - make -} - - -package() { - cd ${srcdir}/sqlite-autoconf-${_amalgamationver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} |
