diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-04 01:23:34 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-04 01:23:34 -0700 |
| commit | c3ff6b4da8966c22dcbf0f5d8a957b875242789f (patch) | |
| tree | 73064dc985b6d59695639dfb6d4ae4ba99395cc5 | |
| parent | 1350233b6dc1924ba29a42462447995f26dae0dc (diff) | |
Thu Oct 4 01:23:34 PDT 2012
229 files changed, 3876 insertions, 1929 deletions
diff --git a/community-testing/alex/PKGBUILD b/community-testing/alex/PKGBUILD index a43506d80..06e7af6ed 100644 --- a/community-testing/alex/PKGBUILD +++ b/community-testing/alex/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 72292 2012-06-11 17:24:33Z tdziedzic $ +# $Id: PKGBUILD 77005 2012-10-03 15:23:22Z 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=1 +pkgrel=2 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' +url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2') +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') diff --git a/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch new file mode 100644 index 000000000..1c6a7dd65 --- /dev/null +++ b/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch @@ -0,0 +1,69 @@ +From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Wed, 12 Sep 2012 03:29:46 -0700 +Subject: [PATCH] fix for ghc 7.6.1 changes + +--- + c2hs/base/general/FileOps.hs | 3 ++- + c2hs/base/state/StateTrans.hs | 3 ++- + c2hs/toplevel/C2HSConfig.hs | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs +index 83ac70c..4914c4b 100644 +--- a/c2hs/base/general/FileOps.hs ++++ b/c2hs/base/general/FileOps.hs +@@ -39,6 +39,7 @@ import Control.Monad (liftM) + import System.Random (newStdGen, randomRs) + + import FNameOps (dirname, stripDirname, addPath) ++import System.IO.Error (catchIOError) + + + -- search for the given file in the given list of directories (EXPORTED) +@@ -89,7 +90,7 @@ mktemp pre post = + in do + h <- openFile fname ReadWriteMode + return (h, fname) +- `catch` \_ -> createLoop (attempts - 1) rs' ++ `catchIOError` \_ -> createLoop (attempts - 1) rs' + -- + sixChars :: [Int] -> ([Int], String) + sixChars is = +diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs +index ada62f4..2ab0ad1 100644 +--- a/c2hs/base/state/StateTrans.hs ++++ b/c2hs/base/state/StateTrans.hs +@@ -84,6 +84,7 @@ import System.IO (fixIO) + import Data.IORef (IORef, newIORef, readIORef, writeIORef) + + import Errors (interr) ++import System.IO.Error (catchIOError) + + infixr 1 +>=, +> + +@@ -337,7 +338,7 @@ fatalsHandledBy m handler = + ioError err + Right a -> return state + ) +- `catch` (\err -> let ++ `catchIOError` (\err -> let + STB handler' = handler err + in + handler' bs gs) +diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs +index e8deddf..af32886 100644 +--- a/c2hs/toplevel/C2HSConfig.hs ++++ b/c2hs/toplevel/C2HSConfig.hs +@@ -46,7 +46,7 @@ import Data.Array (Array, array) + + import Foreign (Ptr, FunPtr) + import Foreign (Storable(sizeOf, alignment), toBool) +-import Foreign.C (CInt) ++import Foreign.C (CInt(..)) + import System.Info (os) + + -- program settings +-- +1.7.12 + diff --git a/community-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD index f01a2162c..ada8cb54f 100644 --- a/community-testing/gtk2hs-buildtools/PKGBUILD +++ b/community-testing/gtk2hs-buildtools/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 72293 2012-06-11 17:24:36Z tdziedzic $ +# $Id: PKGBUILD 77006 2012-10-03 15:23:27Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools pkgver=0.12.3.1 -pkgrel=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' 'alex' 'happy' 'haskell-random') +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) -md5sums=('612611d831635024c953d2817b124e29') +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 } diff --git a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch new file mode 100644 index 000000000..2e687db21 --- /dev/null +++ b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch @@ -0,0 +1,33 @@ +From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 07:43:41 -0700 +Subject: [PATCH] fix incorrect types in documentation/haddock + +--- + src/Documentation/Haddock.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs +index 60bb314..8fd9674 100644 +--- a/src/Documentation/Haddock.hs ++++ b/src/Documentation/Haddock.hs +@@ -59,6 +59,7 @@ import Haddock.Types + import Haddock.Options + import Haddock.Utils + import Main ++import GHC (Ghc) + + + -- | Create 'Interface' structures from a given list of Haddock command-line +@@ -68,7 +69,7 @@ import Main + createInterfaces + :: [Flag] -- ^ A list of command-line flags + -> [String] -- ^ File or module names +- -> IO [Interface] -- ^ Resulting list of interfaces ++ -> Ghc [Interface] -- ^ Resulting list of interfaces + createInterfaces flags modules = do + (_, ifaces, _) <- readPackagesAndProcessModules flags modules + return ifaces +-- +1.7.12 + diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD index 81a65961c..274cc7851 100644 --- a/community-testing/haddock/PKGBUILD +++ b/community-testing/haddock/PKGBUILD @@ -1,31 +1,30 @@ -# Maintainer: -# Contributor: Alexander Rødseth <rodseth@gmail.com> +# 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.10.0 -pkgrel=2 +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' 'happy') -depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8') +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") -sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410') +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" - - # These doesn't make haddock work for ghc 7.4.1 - #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal - #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal - #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + 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 @@ -37,11 +36,15 @@ 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 -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" + 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-testing/happy/PKGBUILD b/community-testing/happy/PKGBUILD index 398cf1f1a..583471724 100644 --- a/community-testing/happy/PKGBUILD +++ b/community-testing/happy/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 72295 2012-06-11 17:24:44Z tdziedzic $ +# $Id: PKGBUILD 77008 2012-10-03 15:23:39Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=happy -pkgver=1.18.9 -pkgrel=5 +pkgver=1.18.10 +pkgrel=1 pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" +url="http://hackage.haskell.org/package/happy" arch=('i686' 'x86_64') license=("custom:BSD3") depends=('gmp') -makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1') +makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('aeb565fe572f979f15a24db0df2de37d') +md5sums=('a1638e89434427e57f68ef311761dc30') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # try was deprecated and removed into control.exception + # we really want tryIOError + #sed 's/try/&IOError/' -i Setup.lhs + runhaskell Setup.lhs configure -O --prefix=/usr runhaskell Setup.lhs build } diff --git a/community-testing/haskell-bytestring-show/PKGBUILD b/community-testing/haskell-bytestring-show/PKGBUILD index 734a920c1..27175c739 100644 --- a/community-testing/haskell-bytestring-show/PKGBUILD +++ b/community-testing/haskell-bytestring-show/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 72297 2012-06-11 17:24:54Z tdziedzic $ +# $Id: PKGBUILD 77009 2012-10-03 15:23:44Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show -pkgver=0.3.5.1 -pkgrel=3 +pkgver=0.3.5.3 +pkgrel=1 pkgdesc="Efficient conversion of values into readable byte strings." -url="http://code.haskell.org/~dolio/" +url="http://hackage.haskell.org/package/bytestring-show" license=("BSD3") arch=('i686' 'x86_64') -depends=("ghc=7.4.2-1") +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=('7396bc2e8f88dedc3374c3f12f24e4bd') +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 diff --git a/community-testing/haskell-cairo/PKGBUILD b/community-testing/haskell-cairo/PKGBUILD index a03864409..8544d0018 100644 --- a/community-testing/haskell-cairo/PKGBUILD +++ b/community-testing/haskell-cairo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72298 2012-06-11 17:24:59Z tdziedzic $ +# $Id: PKGBUILD 77010 2012-10-03 15:23:49Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo pkgver=0.12.3.1 -pkgrel=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.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') makedepends=("gtk2hs-buildtools") options=('strip') conflicts=('gtk2hs-cairo') diff --git a/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch new file mode 100644 index 000000000..9f544bb27 --- /dev/null +++ b/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch @@ -0,0 +1,25 @@ +From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 05:06:59 -0700 +Subject: [PATCH] update build deps for ghc 7.6.1 + +--- + dataenc.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dataenc.cabal b/dataenc.cabal +index 1ad42ca..3a4f5bb 100644 +--- a/dataenc.cabal ++++ b/dataenc.cabal +@@ -21,7 +21,7 @@ flag BuildTests + + library + hs-source-dirs: src +- build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5 ++ build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6 + exposed-modules: + Codec.Binary.Base16 + Codec.Binary.Base32 +-- +1.7.12 + diff --git a/community-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD index 119465093..0b57ab46c 100644 --- a/community-testing/haskell-dataenc/PKGBUILD +++ b/community-testing/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72299 2012-06-11 17:25:04Z tdziedzic $ +# $Id: PKGBUILD 77011 2012-10-03 15:23:56Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.5 @@ -6,18 +6,24 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz + '0001-update-build-deps-for-ghc-7.6.1.patch') install=${pkgname}.install -md5sums=('643a8c022b9c840f801faf9a661fe637') +md5sums=('643a8c022b9c840f801faf9a661fe637' + '662056adcb79efe8898298c271b49600') build() { cd ${srcdir}/${_hkgname}-${pkgver} + + # update build deps for ghc 7.6.1 + patch -Np1 -i ${srcdir}/0001-update-build-deps-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 diff --git a/community-testing/haskell-ghc-paths/PKGBUILD b/community-testing/haskell-ghc-paths/PKGBUILD index 25bb789ee..1e23d3c10 100644 --- a/community-testing/haskell-ghc-paths/PKGBUILD +++ b/community-testing/haskell-ghc-paths/PKGBUILD @@ -4,12 +4,12 @@ pkgname=haskell-ghc-paths pkgver=0.1.0.8 -pkgrel=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.4.2-1') +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') diff --git a/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch new file mode 100644 index 000000000..845beb2bd --- /dev/null +++ b/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch @@ -0,0 +1,55 @@ +From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Thu, 27 Sep 2012 04:48:10 -0700 +Subject: [PATCH] compatibility with ghc 7.6.1 + +--- + System/Glib/GObject.chs | 4 +--- + System/Glib/MainLoop.chs | 4 ++-- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs +index 5f0fe5c..9925d2c 100644 +--- a/System/Glib/GObject.chs ++++ b/System/Glib/GObject.chs +@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do + + {#pointer GDestroyNotify as DestroyNotify#} + +-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify +- + -- | This function wraps any newly created objects that derives from + -- GInitiallyUnowned also known as objects with + -- \"floating-references\". The object will be refSink (for glib +@@ -225,4 +223,4 @@ isA obj gType = + -- at this point we would normally implement the notify signal handler; + -- I've moved this definition into the Object class of the gtk package + -- since there's a quite a bit of machinery missing here (generated signal +--- register functions and the problem of recursive modules) +\ No newline at end of file ++-- register functions and the problem of recursive modules) +diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs +index 72fecb6..feb4c77 100644 +--- a/System/Glib/MainLoop.chs ++++ b/System/Glib/MainLoop.chs +@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr) + + {#pointer SourceFunc#} + +-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc ++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc + + type HandlerId = {#type guint#} + +@@ -79,7 +79,7 @@ type HandlerId = {#type guint#} + -- + makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify) + makeCallback fun = do +- funPtr <- mkSourceFunc fun ++ funPtr <- mkSourceFunc (const fun) + return (funPtr, destroyFunPtr) + + -- | Sets a function to be called at regular intervals, with the default +-- +1.7.12.1 + diff --git a/community-testing/haskell-glib/PKGBUILD b/community-testing/haskell-glib/PKGBUILD index 48f6ae589..29871ceb0 100644 --- a/community-testing/haskell-glib/PKGBUILD +++ b/community-testing/haskell-glib/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 72301 2012-06-11 17:25:15Z tdziedzic $ +# $Id: PKGBUILD 77013 2012-10-03 15:24:08Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'glib2') +depends=('ghc=7.6.1-1' 'glib2') makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') -source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('f2899bd2a2850fe95479ddb63490eb04') +source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz + '0001-compatibility-with-ghc-7.6.1.patch') +md5sums=('f2899bd2a2850fe95479ddb63490eb04' + 'b00660b7102542942b0b9d84b59d1f3c') build() { - cd ${srcdir}/glib-$pkgver + cd glib-$pkgver + + patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community-testing/haskell-gtk/PKGBUILD b/community-testing/haskell-gtk/PKGBUILD index ae7296f86..ab4be6139 100644 --- a/community-testing/haskell-gtk/PKGBUILD +++ b/community-testing/haskell-gtk/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72302 2012-06-11 17:25:22Z tdziedzic $ +# $Id: PKGBUILD 77014 2012-10-03 15:24:17Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=2 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1') +depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-gtk') replaces=('gtk2hs-gtk') @@ -16,36 +16,33 @@ conflicts=('gtk2hs-gtk') options=('strip') install=gtk2hs-gtk.install source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz - 'gtk-gthread.h-include.patch') -md5sums=('65a65b5cc1e1db0fbf722779a7044ded' - '5277990f8ca28d2b12e77dac97c10354') + ghc-7.6.1.patch) +md5sums=('b10dfe92d2e4dfe3c0c92dd349489727' + '5fb93f37fe3f494b30ee682a36b8f1b6') build() { - cd ${srcdir}/gtk-${pkgver} - - # fix compile error with latest glib2 >= 2.32 - # http://hackage.haskell.org/trac/gtk2hs/ticket/1253 - # got the patch from fedora - patch -Np1 -i ${srcdir}/gtk-gthread.h-include.patch - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${srcdir}/gtk-${pkgver} + patch -p1 <$srcdir/ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs + 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() { - #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - #depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') + _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` + _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}") - cd ${srcdir}/gtk-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk - runhaskell Setup copy --destdir=${pkgdir} + cd ${srcdir}/gtk-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk + runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community-testing/haskell-gtk/ghc-7.6.1.patch b/community-testing/haskell-gtk/ghc-7.6.1.patch new file mode 100644 index 000000000..5e259a38f --- /dev/null +++ b/community-testing/haskell-gtk/ghc-7.6.1.patch @@ -0,0 +1,574 @@ +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -126,7 +126,8 @@ + + {#pointer GWeakNotify#} + +-foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify ++foreign import ccall "wrapper" mkDestructor ++ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify + + -- | Attach a callback that will be called after the + -- destroy hooks have been called +@@ -134,7 +135,7 @@ + objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify + objectWeakref obj uFun = do + funPtrContainer <- newIORef nullFunPtr +- uFunPtr <- mkDestructor $ do ++ uFunPtr <- mkDestructor $ \_ _ -> do + uFun + funPtr <- readIORef funPtrContainer + freeHaskellFunPtr funPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400 +@@ -78,6 +78,10 @@ + entrySetCompletion, + entryGetCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryGetBuffer, ++ entrySetBuffer, ++#endif + #if GTK_CHECK_VERSION(2,20,0) + entryGetIconWindow, + entryGetTextWindow, +@@ -104,6 +108,9 @@ + entryAlignment, + entryCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryBuffer, ++#endif + + -- * Signals + entryActivate, +@@ -157,6 +164,9 @@ + import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey) + import Control.Monad.Reader ( ask ) + import Control.Monad.Trans ( liftIO ) ++#if GTK_CHECK_VERSION (2,18,0) ++import Graphics.UI.Gtk.Entry.EntryBuffer ++#endif + {#import Graphics.UI.Gtk.Types#} + {#import Graphics.UI.Gtk.Signals#} + +@@ -429,6 +439,23 @@ + (toEntry self) + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++-- | Get the 'EntryBuffer' object which holds the text for this widget. ++entryGetBuffer :: EntryClass self => self ++ -> IO EntryBuffer ++entryGetBuffer self = ++ makeNewGObject mkEntryBuffer $ ++ {# call gtk_entry_get_buffer #} ++ (toEntry self) ++ ++-- | Set the 'EntryBuffer' object which holds the text for this widget. ++entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self ++ -> buffer -> IO () ++entrySetBuffer self = ++ {# call gtk_entry_set_buffer #} ++ (toEntry self) . toEntryBuffer ++#endif ++ + #if GTK_CHECK_VERSION(2,20,0) + -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when + -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to +@@ -623,6 +650,15 @@ + entrySetCompletion + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++entryBuffer :: (EntryClass self, EntryBufferClass buffer) => ++ ReadWriteAttr self EntryBuffer buffer ++entryBuffer = newAttr ++ entryGetBuffer ++ entrySetBuffer ++#endif ++ ++ + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400 +@@ -639,14 +639,16 @@ + + + -- | Execute an event handler and assume it handled the event unless it +--- threw a pattern match exception. ++-- threw a pattern match exception or calls mzero (e.g. via guard). + tryEvent :: EventM any () -> EventM any Bool + tryEvent act = do + ptr <- ask + liftIO $ (runReaderT (act >> return True) ptr) + #if __GLASGOW_HASKELL__ >= 610 + `catches` [ Handler (\ (PatternMatchFail _) -> return False) +- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e ++ , Handler (\ e -> if isUserError e && ++ ("Pattern" `isPrefixOf` ioeGetErrorString e || ++ "mzero" == ioeGetErrorString e) + then return False + else throw e) ] + #else +@@ -654,6 +656,8 @@ + IOException e + | "user error (Pattern" `isPrefixOf` show e -> + return False ++ | "user error (mzero" `isPrefixOf` show e -> ++ return False + PatternMatchFail _ -> return False + _ -> throw e) + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -69,6 +69,7 @@ + + -- * Constructors + pixbufNew, ++ pixbufNewFromData, + pixbufNewFromFile, + #if GTK_CHECK_VERSION(2,4,0) + pixbufNewFromFileAtSize, +@@ -402,6 +403,19 @@ + (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width) + (fromIntegral height) + ++pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf ++pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride ++ = wrapNewGObject mkPixbuf $ ++ {#call pixbuf_new_from_data #} ++ imData ++ (fromIntegral . fromEnum $ cSpace) ++ (fromBool hasAlpha) ++ (fromIntegral bitsPerSample) ++ (fromIntegral width) ++ (fromIntegral height) ++ (fromIntegral rowStride) ++ nullFunPtr nullPtr ++ + -- | Create a new image from a String. + -- + -- * Creates a new pixbuf from a string description. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -260,7 +260,7 @@ + -- data succeeded. + clipboardSetWithData self targets getFunc clearFunc = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -282,7 +282,7 @@ + {#pointer ClipboardClearFunc#} + + foreign import ccall "wrapper" mkClipboardGetFunc :: +- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc ++ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc + + foreign import ccall "wrapper" mkClipboardClearFunc :: + (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc +@@ -313,7 +313,7 @@ + -- ignored. + clipboardSetWithOwner self targets getFunc clearFunc owner = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -404,7 +404,7 @@ + clipboardRequestContents self (Atom target) callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + runReaderT callback sPtr + return ()) +@@ -418,7 +418,7 @@ + {#pointer ClipboardReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc ++ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc + + -- %hash c:7bb1 d:4ef1 + -- | Requests the contents of the clipboard as text. When the text is later +@@ -439,7 +439,7 @@ + clipboardRequestText self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTextReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mStr <- if sPtr==nullPtr then return Nothing else + liftM Just $ peekUTFString sPtr +@@ -453,7 +453,7 @@ + {#pointer ClipboardTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTextReceivedFunc :: +- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc ++ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc + + + #if GTK_CHECK_VERSION(2,6,0) +@@ -477,7 +477,7 @@ + clipboardRequestImage self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardImageReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr) + callback mPixbuf) +@@ -490,7 +490,7 @@ + {#pointer ClipboardImageReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardImageReceivedFunc :: +- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc ++ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc + + #endif + +@@ -513,7 +513,7 @@ + clipboardRequestTargets self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTargetsReceivedFunc +- (\_ tPtr len -> do ++ (\_ tPtr len _ -> do + -- We must free Haskell pointer *in* the callback to avoid segfault. + freeHaskellFunPtr =<< readIORef cbRef + mTargets <- if tPtr==nullPtr then return Nothing else +@@ -528,7 +528,7 @@ + {#pointer ClipboardTargetsReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc :: +- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc ++ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc + + #if GTK_CHECK_VERSION(2,10,0) + -- %hash c:5601 d:d6a6 +@@ -552,10 +552,10 @@ + clipboardRequestRichText self buffer callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardRichTextReceivedFunc +- (\_ tPtr sPtr len -> do ++ (\_ tPtr sPtr len _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do +- str <- peekUTFStringLen (sPtr,fromIntegral len) ++ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len) + return (Atom tPtr, str) + callback mRes) + writeIORef cbRef cbPtr +@@ -568,7 +568,7 @@ + {#pointer ClipboardRichTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) -> ++ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) -> + IO ClipboardRichTextReceivedFunc + #endif + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -202,7 +202,7 @@ + -- their arguments from the main loop, that is, from the OS thread of Gtk, + -- thereby ensuring that any Gtk and OS function can be called. + -- +-{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #} ++{#fun gdk_threads_enter as threadsEnter {} -> `()' #} + + -- | Release the global Gtk lock. + -- +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -493,17 +493,17 @@ + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) nullFunPtr nullPtr nullFunPtr + comboBoxSetRowSeparatorSource self (Just (model, extract)) = do +- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do ++ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do + iter <- peek iterPtr + value <- customStoreGetRow model iter +- return (extract value) ++ return (fromBool $ extract value) + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr + + {#pointer TreeViewRowSeparatorFunc#} + + foreign import ccall "wrapper" mkRowSeparatorFunc :: +- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc + + -- %hash c:5bf8 + -- | Sets whether the popup menu should have a tearoff menu item. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400 +@@ -76,6 +76,12 @@ + menuItemNewWithMnemonic, + + -- * Methods ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemSetLabel, ++ menuItemGetLabel, ++ menuItemSetUseUnderline, ++ menuItemGetUseUnderline, ++#endif + menuItemSetSubmenu, + menuItemGetSubmenu, + menuItemRemoveSubmenu, +@@ -89,6 +95,10 @@ + -- * Attributes + menuItemSubmenu, + menuItemRightJustified, ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemLabel, ++ menuItemUseUnderline, ++#endif + + -- * Signals + menuItemActivateItem, +@@ -163,7 +173,36 @@ + + -------------------- + -- Methods ++#if GTK_CHECK_VERSION(2,16,0) ++-- | Sets text on the MenuItem label ++ ++menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO () ++menuItemSetLabel self label = ++ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self) ++ ++-- | Gets text on the MenuItem label ++menuItemGetLabel :: (MenuItemClass self) => self -> IO String ++menuItemGetLabel self = ++ {# call gtk_menu_item_get_label #} ++ (toMenuItem self) ++ >>= \strPtr -> if strPtr == nullPtr ++ then return "" ++ else peekUTFString strPtr ++ ++-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO () ++menuItemSetUseUnderline self = ++ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool + ++-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool ++menuItemGetUseUnderline self = ++ liftM toBool $ {# call gtk_menu_item_get_use_underline #} ++ (toMenuItem self) ++ ++#endif + -- | Sets the item's submenu, or changes it. + -- + menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO () +@@ -278,6 +317,22 @@ + menuItemGetRightJustified + menuItemSetRightJustified + ++#if GTK_CHECK_VERSION(2,16,0) ++-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel' ++-- ++menuItemLabel :: MenuItemClass self => Attr self String ++menuItemLabel = newAttr ++ menuItemGetLabel ++ menuItemSetLabel ++ ++-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and ++-- 'menuItemGetUseEUnderline' ++-- ++menuItemUseUnderline :: MenuItemClass self => Attr self Bool ++menuItemUseUnderline = newAttr ++ menuItemGetUseUnderline ++ menuItemSetUseUnderline ++#endif + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400 +@@ -239,7 +239,7 @@ + customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource, + customTreeDragDestIface = fromMaybe dummyDragDest mDragDest } + privPtr <- newStablePtr priv +- liftM con $ makeNewGObject (CustomStore, objectUnref) $ ++ liftM con $ wrapNewGObject (CustomStore, objectUnref) $ + gtk2hs_store_new implPtr privPtr + + foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new" +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -427,7 +427,7 @@ + {#pointer TreeModelForeachFunc#} + + foreign import ccall "wrapper" mkTreeModelForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) -> + IO TreeModelForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -160,7 +160,7 @@ + {#pointer TreeModelFilterVisibleFunc #} + + foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc :: +- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> + IO TreeModelFilterVisibleFunc + + -- %hash c:a56d d:b42e +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -151,7 +151,7 @@ + treeSelectionSetSelectFunction :: TreeSelectionClass self => self + -> TreeSelectionCB -> IO () + treeSelectionSetSelectFunction ts fun = do +- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do ++ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do + path <- peekTreePath (castPtr tp) + liftM fromBool $ fun path + ) +@@ -168,7 +168,7 @@ + {#pointer TreeSelectionFunc#} + + foreign import ccall "wrapper" mkTreeSelectionFunc :: +- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> ++ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)-> + IO TreeSelectionFunc + + -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on. +@@ -199,7 +199,7 @@ + -> TreeSelectionForeachCB + -> IO () + treeSelectionSelectedForeach self fun = do +- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do ++ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do + -- make a deep copy of the iterator. This makes it possible to store this + -- iterator in Haskell land somewhere. The TreeModel parameter is not + -- passed to the function due to performance reasons. But since it is +@@ -219,7 +219,7 @@ + {#pointer TreeSelectionForeachFunc#} + + foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) + -- | Creates a list of paths of all selected rows. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -582,7 +582,7 @@ + {#pointer TreeViewColumnDropFunc#} + + foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: +- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> ++ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> + Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc + + -- | Scroll to a coordinate. +@@ -798,7 +798,7 @@ + {#pointer TreeViewMappingFunc#} + + foreign import ccall "wrapper" mkTreeViewMappingFunc :: +- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) -> ++ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) -> + IO TreeViewMappingFunc + + -- | Check if row is expanded. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400 +@@ -1251,16 +1251,26 @@ + + -- | A 'Pixbuf' is inserted into the buffer. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ()) + insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy) + + -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. + -- Insertion actually occurs in the default handler. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ()) + insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy) + +--- | Some text was inserted. ++-- | Some text is inserted. Insertion actually occurs in the default handler. ++-- ++-- * The function connected to this handler may not modify the buffer since ++-- this would invalidate the iterator. If this function replaces the ++-- default handler, it needs to stop the emission of this signal in order ++-- to prevent the default handler from running. If additional text should ++-- be inserted, this can be done using the 'after' function to connect. + -- + bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ()) + bufferInsertText = Signal $ \after obj handler -> +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -797,7 +797,7 @@ + {#pointer TextCharPredicate#} + + foreign import ccall "wrapper" mkTextCharPredicate :: +- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate ++ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate + + -- | Move 'TextIter' forward until a + -- predicate function returns True. +@@ -810,7 +810,7 @@ + textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterForwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_forward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +@@ -827,7 +827,7 @@ + textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterBackwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_backward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -274,7 +274,7 @@ + {#pointer AssistantPageFunc#} + + foreign import ccall "wrapper" mkAssistantPageFunc :: +- ({#type glong#} -> Ptr () -> IO {#type glong#}) ++ ({#type gint#} -> Ptr () -> IO {#type gint#}) + -> IO AssistantPageFunc + + -- | Sets the page type for @page@. The page type determines the page behavior diff --git a/community-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD index f761596b3..35cc7dc7e 100644 --- a/community-testing/haskell-haskeline/PKGBUILD +++ b/community-testing/haskell-haskeline/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 72303 2012-06-11 17:25:27Z tdziedzic $ +# $Id: PKGBUILD 77015 2012-10-03 15:24:22Z 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.6.4.7 +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.4.2-1' 'sh' 'haskell-utf8-string=0.3.7-2' 'haskell-mtl=2.1.1-1' 'haskell-terminfo=0.3.2.3-2') +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=('d8d0a90a9965f4f68935e76e4e777035') +md5sums=('3a78043dc80b5510202e71e77c0a9923') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community-testing/haskell-hslogger/PKGBUILD b/community-testing/haskell-hslogger/PKGBUILD index 16fa89b1f..49a283786 100644 --- a/community-testing/haskell-hslogger/PKGBUILD +++ b/community-testing/haskell-hslogger/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 72304 2012-06-11 17:25:32Z tdziedzic $ +# $Id: PKGBUILD 77016 2012-10-03 15:24:27Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger -pkgver=1.1.5 -pkgrel=7 +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.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1') +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=('cd3dfd6f88176bd53b333ea29130a857') +md5sums=('e0737887b0df75a3781989c8f6689850') build() { cd ${srcdir}/hslogger-${pkgver} diff --git a/community-testing/haskell-html/PKGBUILD b/community-testing/haskell-html/PKGBUILD index f9aaa0f0f..8eb9fc6f4 100644 --- a/community-testing/haskell-html/PKGBUILD +++ b/community-testing/haskell-html/PKGBUILD @@ -5,12 +5,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=11 +pkgrel=12 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') diff --git a/community-testing/haskell-pango/PKGBUILD b/community-testing/haskell-pango/PKGBUILD index f54c22737..b5b3f0f39 100644 --- a/community-testing/haskell-pango/PKGBUILD +++ b/community-testing/haskell-pango/PKGBUILD @@ -1,43 +1,46 @@ -# $Id: PKGBUILD 72306 2012-06-11 17:25:42Z tdziedzic $ +# $Id: PKGBUILD 77018 2012-10-03 15:24:37Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango pkgver=0.12.3 -pkgrel=2 +pkgrel=3 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1') +depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') replaces=('gtk2hs-pango') conflicts=('gtk2hs-pango') options=('strip') -source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) install=gtk2hs-pango.install +source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) md5sums=('1ef3132cb569703d5b1bc262c9d86fe3') build() { - cd ${srcdir}/pango-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${srcdir}/pango-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs + 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() { - #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - #depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-` + _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}") - cd ${srcdir}/pango-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango - runhaskell Setup copy --destdir=${pkgdir} + cd ${srcdir}/pango-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango + runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch new file mode 100644 index 000000000..a25506e67 --- /dev/null +++ b/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch @@ -0,0 +1,50 @@ +From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 03:59:50 -0700 +Subject: [PATCH] update code to support extensible exceptions no longer being + a part of ghc >= 7.6.1 + +--- + QuickCheck.cabal | 6 +++++- + Test/QuickCheck/Exception.hs | 6 ++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/QuickCheck.cabal b/QuickCheck.cabal +index 1a9126e..5afd6fb 100644 +--- a/QuickCheck.cabal ++++ b/QuickCheck.cabal +@@ -60,9 +60,13 @@ library + Build-depends: ghc + + -- We want to use extensible-exceptions even if linking against base-3. +- if impl(ghc >= 6.9) ++ if impl(ghc >= 6.9) && impl(ghc < 7.6) + Build-depends: extensible-exceptions + ++ -- GHC >= 7.6.1 no longer provides extensible exceptions ++ if impl(ghc >= 7.6) ++ cpp-options: -DNEW_EXCEPTIONS ++ + -- Modules that are always built. + Exposed-Modules: + Test.QuickCheck, +diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs +index f895351..d463195 100644 +--- a/Test/QuickCheck/Exception.hs ++++ b/Test/QuickCheck/Exception.hs +@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where + + #if defined(OLD_EXCEPTIONS) + import Control.Exception(evaluate, try, Exception(..), throw) ++#elif defined(NEW_EXCEPTIONS) ++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw ++#if defined(GHC_INTERRUPT) ++ , AsyncException(UserInterrupt) ++#endif ++ ) + #else + import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw + #if defined(GHC_INTERRUPT) +-- +1.7.12 + diff --git a/community-testing/haskell-quickcheck/PKGBUILD b/community-testing/haskell-quickcheck/PKGBUILD index 70fbf160f..e96121f81 100644 --- a/community-testing/haskell-quickcheck/PKGBUILD +++ b/community-testing/haskell-quickcheck/PKGBUILD @@ -4,20 +4,20 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck -pkgver=2.4.2 -pkgrel=2 +pkgver=2.5.1.1 +pkgrel=1 pkgdesc="Automatic testing of Haskell programs" url="http://hackage.haskell.org/package/QuickCheck" license=('custom:BSD3') arch=('i686' 'x86_64') -#depends=('ghc=7.4.2-1' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') -depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh') +depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67') +md5sums=('2631b41c8b6e297b52622d1698387f09') 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 diff --git a/community-testing/haskell-regex-base/PKGBUILD b/community-testing/haskell-regex-base/PKGBUILD index d787c6007..d4e951cc6 100644 --- a/community-testing/haskell-regex-base/PKGBUILD +++ b/community-testing/haskell-regex-base/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=6 +pkgrel=7 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') diff --git a/community-testing/haskell-regex-compat/PKGBUILD b/community-testing/haskell-regex-compat/PKGBUILD index f1e91b553..c546442ec 100644 --- a/community-testing/haskell-regex-compat/PKGBUILD +++ b/community-testing/haskell-regex-compat/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=2 +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.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1') +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') diff --git a/community-testing/haskell-regex-posix/PKGBUILD b/community-testing/haskell-regex-posix/PKGBUILD index f49daf3b2..3c570e4d1 100644 --- a/community-testing/haskell-regex-posix/PKGBUILD +++ b/community-testing/haskell-regex-posix/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=1 +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.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6') +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') diff --git a/community-testing/haskell-stm/PKGBUILD b/community-testing/haskell-stm/PKGBUILD index 8eba45641..fec52e949 100644 --- a/community-testing/haskell-stm/PKGBUILD +++ b/community-testing/haskell-stm/PKGBUILD @@ -3,16 +3,16 @@ # Package generated by cabal2arch 0.7.5 _hkgname=stm pkgname=haskell-stm -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('fcaf091a492974045cc04b231a3b7c9c') +md5sums=('fe8ab1a8231202f1748da53454cf55fc') build() { cd ${srcdir}/${_hkgname}-$pkgver diff --git a/community-testing/haskell-syb/PKGBUILD b/community-testing/haskell-syb/PKGBUILD index 301c463b5..a2595bf2c 100644 --- a/community-testing/haskell-syb/PKGBUILD +++ b/community-testing/haskell-syb/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=syb pkgname=haskell-syb -pkgver=0.3.6.1 +pkgver=0.3.7 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('50e0a755fcc735cccd0d77a89714ae38') +md5sums=('fa653976a4ee43918cc7546089f94b60') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch new file mode 100644 index 000000000..b8c2264bc --- /dev/null +++ b/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch @@ -0,0 +1,50 @@ +From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 06:24:09 -0700 +Subject: [PATCH] update changed time code for ghc 7.6.1 + +--- + Codec/Archive/Tar/Pack.hs | 9 +++++---- + tar.cabal | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs +index 8e43091..0af6103 100644 +--- a/Codec/Archive/Tar/Pack.hs ++++ b/Codec/Archive/Tar/Pack.hs +@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native + import System.Directory + ( getDirectoryContents, doesDirectoryExist, getModificationTime + , Permissions(..), getPermissions ) +-import System.Time +- ( ClockTime(..) ) ++import Data.Time.Clock.POSIX ++ ( utcTimeToPOSIXSeconds ) + import System.IO + ( IOMode(ReadMode), openBinaryFile, hFileSize ) + import System.IO.Unsafe (unsafeInterleaveIO) +@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do + + getModTime :: FilePath -> IO EpochTime + getModTime path = do +- (TOD s _) <- getModificationTime path +- return $! fromIntegral s ++ utcTime <- getModificationTime path ++ let s = truncate . utcTimeToPOSIXSeconds $ utcTime ++ return $! s +diff --git a/tar.cabal b/tar.cabal +index e748b07..d85b0da 100644 +--- a/tar.cabal ++++ b/tar.cabal +@@ -25,7 +25,7 @@ source-repository head + + library + build-depends: base >= 3 && < 5, filepath, +- directory, old-time, bytestring ++ directory, bytestring, time + + exposed-modules: + Codec.Archive.Tar +-- +1.7.12 + diff --git a/community-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD index 5b0c05867..ab2f5f8f4 100644 --- a/community-testing/haskell-tar/PKGBUILD +++ b/community-testing/haskell-tar/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 72313 2012-06-11 17:26:17Z tdziedzic $ +# $Id: PKGBUILD 77025 2012-10-03 15:25:16Z 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=2 +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.4.2-1') -options=('strip') -source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") +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') +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 diff --git a/community-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD index e2c42b4c6..5ae271a8c 100644 --- a/community-testing/haskell-terminfo/PKGBUILD +++ b/community-testing/haskell-terminfo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 72314 2012-06-11 17:26:22Z tdziedzic $ +# $Id: PKGBUILD 77026 2012-10-03 15:25:21Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=terminfo pkgname=haskell-terminfo -pkgver=0.3.2.3 -pkgrel=2 +pkgver=0.3.2.5 +pkgrel=1 pkgdesc="Haskell bindings to the terminfo library." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('706f546c629ac100a402c9c2629c25fa') +md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD index 27fdc1787..c9bb3acfd 100644 --- a/community-testing/haskell-utf8-string/PKGBUILD +++ b/community-testing/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72315 2012-06-11 17:26:27Z tdziedzic $ +# $Id: PKGBUILD 77027 2012-10-03 15:25:26Z 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=2 +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.4.2-1' 'sh') +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') diff --git a/community-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD index bf549cf81..5f2e744e6 100644 --- a/community-testing/haskell-x11-xft/PKGBUILD +++ b/community-testing/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72317 2012-06-11 17:26:37Z tdziedzic $ +# $Id: PKGBUILD 77029 2012-10-03 15:25:36Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=4 +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.4.2-1' 'haskell-x11=1.6.0' 'haskell-utf8-string=0.3.7' 'libxft') +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) diff --git a/community-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD index a44990b47..209ccbe86 100644 --- a/community-testing/haskell-x11/PKGBUILD +++ b/community-testing/haskell-x11/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 72316 2012-06-11 17:26:32Z tdziedzic $ +# $Id: PKGBUILD 77028 2012-10-03 15:25:31Z tdziedzic $ # 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 +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.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr') +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=('8199520ce58e91762d31d54ed081b99c') +md5sums=('0227ba7a8788c3cfd146e952a5fafc82') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community-testing/haskell-xhtml/PKGBUILD b/community-testing/haskell-xhtml/PKGBUILD index 68041976a..7ccfca159 100644 --- a/community-testing/haskell-xhtml/PKGBUILD +++ b/community-testing/haskell-xhtml/PKGBUILD @@ -1,38 +1,49 @@ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 +# Contributor: Alexander Rødseth <rodseth@gmail.com> _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.1 -pkgrel=1 -pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." -url="http://hackage.haskell.org/package/xhtml" +pkgrel=2 +pkgdesc='Combinators for producing XHTML 1.0' +url='http://hackage.haskell.org/package/xhtml' license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('c63487bea16cbf0ecf252d6ed73106bf') +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 + 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 register --gen-script runhaskell Setup unregister --gen-script sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$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-testing/hedgewars/PKGBUILD b/community-testing/hedgewars/PKGBUILD index 4a8dcde5f..1eeee372a 100644 --- a/community-testing/hedgewars/PKGBUILD +++ b/community-testing/hedgewars/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 72319 2012-06-11 17:26:49Z tdziedzic $ +# $Id: PKGBUILD 77031 2012-10-03 15:25:48Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.17 -pkgrel=3 +pkgrel=5 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' - # haskell specific - 'ghc=7.4.2-1' - 'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3' - 'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' - 'haskell-hslogger=1.1.5-7') + # haskell specific + 'ghc' + 'haskell-network' 'haskell-bytestring-show' + 'haskell-utf8-string' 'haskell-dataenc' + 'haskell-hslogger') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) @@ -26,6 +26,7 @@ build() { cd $pkgname-src-$pkgver # sed -i 's|.*misc/liblua.*||' CMakeLists.txt + sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch new file mode 100644 index 000000000..d4508c916 --- /dev/null +++ b/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch @@ -0,0 +1,34 @@ +From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Wed, 3 Oct 2012 06:51:21 -0700 +Subject: [PATCH] Update usage of catch to catchIOError since catch has been + removed from System.IO.Error in ghc 7.6.1 + +--- + src/Plugins/Monitors/Bright.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs +index 499e5bc..b5ec4c0 100644 +--- a/src/Plugins/Monitors/Bright.hs ++++ b/src/Plugins/Monitors/Bright.hs +@@ -20,6 +20,7 @@ import Data.Char + import System.FilePath ((</>)) + import System.Posix.Files (fileExist) + import System.Console.GetOpt ++import System.IO.Error (catchIOError) + + data BrightOpts = BrightOpts + { subDir :: String +@@ -101,7 +102,7 @@ readBright files = + maxVal <- grab $ (fMax files) + return $ (currVal / maxVal) + where +- grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) ++ grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) + + + showHorizontalBar :: Float -> Monitor String +-- +1.7.12.2 + diff --git a/community-testing/xmobar/PKGBUILD b/community-testing/xmobar/PKGBUILD index 42f0207ad..25e6e53e1 100644 --- a/community-testing/xmobar/PKGBUILD +++ b/community-testing/xmobar/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 72320 2012-06-11 17:26:54Z tdziedzic $ +# $Id: PKGBUILD 77032 2012-10-03 15:25:55Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.4 pkgname=xmobar -pkgver=0.15 +pkgver=0.16 pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' +makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') options=('strip') -source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch) +#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-builddep.patch) +# Use Git snapshot for Ghc 7.6.1 rebuild +source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz +0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch) build() { - cd ${srcdir}/xmobar-$pkgver - # Fix haskell mtl dep - patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch + cd ${srcdir}/xmobar + patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib" + runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" runhaskell Setup build } package() { - cd ${srcdir}/xmobar-$pkgver + cd ${srcdir}/xmobar runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('0658679b39168f49d32fe178029ff9f1') -md5sums=('0658679b39168f49d32fe178029ff9f1' - '0d9fb64557233c3a349feb53097c7b09') +md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' + 'ffd6079c879f3b6ff7208a846d6ee241' + '149583c19ac3d0ad829f3138342bb9db') diff --git a/community-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD index a5f9d716f..71a84cdfe 100644 --- a/community-testing/xmonad-contrib/PKGBUILD +++ b/community-testing/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72322 2012-06-11 17:27:12Z tdziedzic $ +# $Id: PKGBUILD 77034 2012-10-03 15:26:13Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.2-1' 'xmonad=0.10-4' 'sh' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1-4' 'haskell-utf8-string=0.3.7-2' 'haskell-random=1.0.1.1-2') +depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD index 53ad4fcc1..2ed9c2a9f 100644 --- a/community-testing/xmonad/PKGBUILD +++ b/community-testing/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72321 2012-06-11 17:27:05Z tdziedzic $ +# $Id: PKGBUILD 77033 2012-10-03 15:26:06Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.2-1' 'gmp' 'haskell-x11=1.6.0' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-utf8-string=0.3.7') +depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions') makedepends=('setconf' 'gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' @@ -19,6 +19,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p build() { cd "$srcdir" + ghc-pkg list gendesk cd $srcdir/$pkgname-$pkgver @@ -39,7 +40,7 @@ package() { install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh runhaskell Setup.lhs copy --destdir=$pkgdir - # runhaskell util/GenerateManpage.hs + #runhaskell util/GenerateManpage.hs install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD index c0d05b495..e845b85b7 100644 --- a/community/i3status/PKGBUILD +++ b/community/i3status/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70601 2012-05-12 12:03:50Z ttopper $ +# $Id: PKGBUILD 77036 2012-10-03 18:05:35Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3status -pkgver=2.5.1 +pkgver=2.6 pkgrel=1 pkgdesc="Generates status bar to use with dzen2 or xmobar" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=('etc/i3status.conf') install=i3status.install options=('docs') source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2") -md5sums=('28c27fc0c2294e12ae6ae390f3d89973') +md5sums=('98f649429d7845682846de36fb38f780') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index e86a65456..090ddb019 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 61131 2011-12-22 05:37:54Z kkeen $ +# $Id: PKGBUILD 77050 2012-10-03 23:55:24Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20111222 +pkgver=20120914 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -11,15 +11,15 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('bcc8b8b6e8c09af7d053471a473ef6e8') +md5sums=('4b1cae2237db068ee4738789286a0409') build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname" install -Dm644 $pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" } diff --git a/community/packeth/PKGBUILD b/community/packeth/PKGBUILD index 041f3f71b..7fec455f2 100644 --- a/community/packeth/PKGBUILD +++ b/community/packeth/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 68633 2012-03-30 15:24:47Z tredaelli $ +# $Id: PKGBUILD 77004 2012-10-03 15:04:34Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rudy Matela <rudy.matela@gmail.com> pkgname=packeth -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="A Linux GUI packet generator tool for ethernet." depends=(gtk2) source=("http://downloads.sourceforge.net/packeth/packETH-$pkgver.tar.bz2") url="http://packeth.sourceforge.net/" -md5sums=('38403ec01072f13ba7f0145abf15b12d') +md5sums=('dab613ab413e959cb5c1ef6fd385a041') arch=('i686' 'x86_64') license=('GPL') build() { - cd "$srcdir"/packETH-1.7 + cd "$srcdir"/packETH-$pkgver + + sed -i 's/^LIBS=/LIBS+=/' Makefile.am + autoreconf ./configure --prefix=/usr make } package() { - cd "$srcdir"/packETH-1.7 + cd "$srcdir"/packETH-$pkgver make install DESTDIR="$pkgdir/" } diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index efc846ca4..c00a3466f 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 74773 2012-08-04 00:52:49Z bisson $ +# $Id: PKGBUILD 77048 2012-10-03 23:34:04Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari -pkgver=2.5.2 +pkgver=2.5.3 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -12,7 +12,7 @@ depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") -sha1sums=('3efe590e885a7dde521b8553762d3207b919e69f') +sha1sums=('de79eee7ae017a495dc0c648b6f7d5a4f6c7a522') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 839ff1c63..e96c8ac14 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71765 2012-06-02 10:29:58Z bluewind $ +# $Id: PKGBUILD 76996 2012-10-03 07:10:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.72 -pkgrel=2 +pkgver=0.77 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3') +md5sums=('1c35bb64f0a261cd3ab4cc161726290a') build() { cd $srcdir/DateTime-$pkgver diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD index 00ed2fc69..f86f075ee 100644 --- a/core/run-parts/PKGBUILD +++ b/core/run-parts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162908 2012-07-03 17:24:27Z pierre $ +# $Id: PKGBUILD 167702 2012-10-03 08:21:43Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.3.2 +pkgver=4.3.4 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('0062d774306a6acc34d3b855a5c4eeb845653b0cd34dbb5c13aa00b4ecb8af22') +sha256sums=('1739976cb62b85e641ee36859a87dfb8e4c3214e1043b6bb00b56b87e96a19f5') build() { cd $srcdir/debianutils-$pkgver diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 61bd980df..45b4ef127 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166203 2012-09-05 18:26:55Z andrea $ +# $Id: PKGBUILD 167762 2012-10-03 14:39:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f216d37e961f46f5830fb15d65c71a9c322cebfa') +sha1sums=('7e5ec2aa1492450ea1de40f9e110561f6221b5ca') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 4e6cd1b2b..36cfd941e 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166227 2012-09-05 18:29:27Z andrea $ +# $Id: PKGBUILD 167790 2012-10-03 14:41:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('f9edb471a3245f3d2e429d5d2140954673f97a9c') +sha1sums=('fbf63de8b286e8238383f49991ffb7651f9099d2') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 389877fca..79fc607a7 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166228 2012-09-05 18:29:31Z andrea $ +# $Id: PKGBUILD 167791 2012-10-03 14:41:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('8715188d1e3c01f204409bad2bad6d0f30a3f39a') +sha1sums=('e55ccb92ce22250a8d8139d2367ef9f35c5b34d1') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index 8de02de3f..28a811c8c 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166229 2012-09-05 18:29:38Z andrea $ +# $Id: PKGBUILD 167792 2012-10-03 14:41:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('9205eba59c39f9d9e0a38c8424bdde73cb43a174') +sha1sums=('4429196f346271a825e721be56e92189a3c0da2a') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index fa77f3ddf..62a117a30 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166230 2012-09-05 18:29:43Z andrea $ +# $Id: PKGBUILD 167793 2012-10-03 14:41:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('ca977db4f5cbaa6ca99adb21ce6b16306f94de6b') +sha1sums=('c9e27c71fd9bb01ee498cb0799d848611d031dcc') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index e82468eb9..014130c08 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166231 2012-09-05 18:29:48Z andrea $ +# $Id: PKGBUILD 167794 2012-10-03 14:41:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('fae5e95a1d65a2e4b0a695969c159d6bb75283ef') +sha1sums=('7e982aa5a57a9f671ec69f3504ca4dc50076778d') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 108b02947..336fcb4d3 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166232 2012-09-05 18:29:55Z andrea $ +# $Id: PKGBUILD 167795 2012-10-03 14:41:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -15,7 +15,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('9c544f883c5116a928027944fce7a21715c421f3' +sha1sums=('0b97528870a23440ba450f87be878e3abdf9e0e1' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 1f273dd63..8f984a727 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166233 2012-09-05 18:29:59Z andrea $ +# $Id: PKGBUILD 167796 2012-10-03 14:41:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('95a6aac7e6e39a1618de1452ef5d0bb1cb8c9956') +sha1sums=('6a93ed5fd33b27b88b653c15c546b223ed880a4d') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index f44bc741f..0ee08e512 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166234 2012-09-05 18:30:03Z andrea $ +# $Id: PKGBUILD 167797 2012-10-03 14:41:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('57af84c4fc441dfc3bcea9eef96b6283a3a8322e') +sha1sums=('bab9dcab839cc975fb3b94ac383d25b94066fe92') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 9363a4fea..8875fd2a5 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166216 2012-09-05 18:28:21Z andrea $ +# $Id: PKGBUILD 167778 2012-10-03 14:40:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.9.1 -pkgrel=3 +pkgver=4.9.2 +pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -29,9 +29,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'fix-freeze.patch') -sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' @@ -39,8 +38,7 @@ sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514' - '820135367cc577a8557061b9844d3ce4a5fde90f') + 'd509dac592bd8b310df27991b208c95b6d907514') build() { cd "${srcdir}"/${_pkgname}-${pkgver} @@ -48,9 +46,6 @@ build() { patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch - # KDEBUG 306260 - patch -p1 -i "${srcdir}"/fix-freeze.patch - cd "${srcdir}" mkdir build cd build diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 19aab3394..ec1987368 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166217 2012-09-05 18:28:31Z andrea $ +# $Id: PKGBUILD 167779 2012-10-03 14:40:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f') +sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 1ccc6c5eb..291cbf193 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166235 2012-09-05 18:30:06Z andrea $ +# $Id: PKGBUILD 167798 2012-10-03 14:42:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('08b1a43eb800de1ad1ed7a0a147e6c73b3928bd8') +sha1sums=('d8c762a6a65323f80e47cadbfa732b529a07dbc1') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 67c19c604..09895928c 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166236 2012-09-05 18:30:12Z andrea $ +# $Id: PKGBUILD 167799 2012-10-03 14:42:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('ea22f9bddd7450e15f6dcf3d7f243874f664bc71' +sha1sums=('efa6b6b6bae89f8e16cbbcf8c5840c6cbdab57e3' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 02574f353..8713e0ac1 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166237 2012-09-05 18:30:16Z andrea $ +# $Id: PKGBUILD 167800 2012-10-03 14:42:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('d97c6ab445ab209d41a817eeebbfa42461c2511a') +sha1sums=('9208e4ad1b8ad97f1220cd6696f22d8b1eab29cb') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 9d8ba383b..faf960007 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166238 2012-09-05 18:30:19Z andrea $ +# $Id: PKGBUILD 167801 2012-10-03 14:42:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('9a4e298770152a9ed903eff22048021e19e5f257') +sha1sums=('7ed1e54f5216e5bfd6b9709900d3df6b606910b5') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 9caf961b4..f2fa972d2 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166211 2012-09-05 18:27:40Z andrea $ +# $Id: PKGBUILD 167773 2012-10-03 14:39:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('9800056ce7e2ced8d8487776e7ecb58d3bf87370') +sha1sums=('1f7d70401c84fa54e937979a7c03d3fa8d7d59c2') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index fdaf5713c..4ede68181 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166212 2012-09-05 18:27:44Z andrea $ +# $Id: PKGBUILD 167774 2012-10-03 14:39:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('b1066dc30d59ddfb16db3f7e1ee11a2f9895dfca') +sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index ed684d937..09871e43c 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166214 2012-09-05 18:27:52Z andrea $ +# $Id: PKGBUILD 167776 2012-10-03 14:40:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('6362e3e1e65085cda1c8b2793ba7105150ec989d') +sha1sums=('7d74ef9d0c66ef6c54fd25aeff89de7f06685dda') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 7d8223782..3b99b49be 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166213 2012-09-05 18:27:49Z andrea $ +# $Id: PKGBUILD 167775 2012-10-03 14:39:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('a5a6b42a7c37c554fa67dcd9a9439c4d32a6c59a') +sha1sums=('549f386325cf02662c685f83b1844c72149255d1') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index d90f1d2ff..65ad2b5ba 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166206 2012-09-05 18:27:11Z andrea $ +# $Id: PKGBUILD 167766 2012-10-03 14:39:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('d73bd72550a644f073b94258591fe2c7c742360b') +sha1sums=('f7ac776e18ad0df7535280ca5e6ea951cde159fb') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 2f531bf86..47a81295a 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166210 2012-09-05 18:27:36Z andrea $ +# $Id: PKGBUILD 167772 2012-10-03 14:39:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -16,7 +16,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdegraphics-okular: Okular bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('ae611a3571306fe77fba5799ac8da4017633c84e') +sha1sums=('ad541046cf64df5a9ffda29979f8868a9c29c354') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 0ae1415ba..380fff71b 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166207 2012-09-05 18:27:14Z andrea $ +# $Id: PKGBUILD 167767 2012-10-03 14:39:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('db56b4a6b4380a61735a4dd5366af75ad4901475') +sha1sums=('a2f70eb2cb67942456604a6538e9cabe8a48aad5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 6c5ef2b90..aaa0aa352 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166224 2012-09-05 18:29:10Z andrea $ +# $Id: PKGBUILD 167787 2012-10-03 14:41:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('b69134548d366f705b8854f8da222758f2d6a0ef') +sha1sums=('065e449af454e08f02ece846fe5b28db09bda1be') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 76753b9b7..eb5633790 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166239 2012-09-05 18:30:25Z andrea $ +# $Id: PKGBUILD 167802 2012-10-03 14:42:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('874596bfccf8e675667c8a5ffe4d104850752c13') +sha1sums=('4f13e61086929da9ba75ee3b73612540054888b1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 34b86e024..6c4c7fb61 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166240 2012-09-05 18:30:30Z andrea $ +# $Id: PKGBUILD 167803 2012-10-03 14:42:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('03e8344bdc258412550d5617424a1fcd8a762e16') +sha1sums=('51b6cf08d43b6ea9fc285283a8ee1d8097b7349b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index 2d0540097..fe0ca29f2 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166241 2012-09-05 18:30:36Z andrea $ +# $Id: PKGBUILD 167804 2012-10-03 14:42:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('15727b87d3951b95ef839dd6bb58dcf193f8fb5c') +sha1sums=('93aceea871e10eff771645f627563517684a11a5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 3bacfa689..6ae05f4b1 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166242 2012-09-05 18:30:41Z andrea $ +# $Id: PKGBUILD 167805 2012-10-03 14:42:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('7a043108edb23a2d857622e44ffb51cf3e870530') +sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 878df2ea6..98603f0cd 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166243 2012-09-05 18:30:46Z andrea $ +# $Id: PKGBUILD 167806 2012-10-03 14:42:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('78961fcd7ee14991be5d3e79068bf0651b86ba3d') +sha1sums=('b6fd76d854473ab6dbfdfdcb09347e7c4363a580') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index eaf180e27..f1fdc8f34 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166244 2012-09-05 18:30:51Z andrea $ +# $Id: PKGBUILD 167807 2012-10-03 14:42:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('a4e4ede1732838e596d1a4f2db054b21ce3bc799') +sha1sums=('82c7c573d6c0c248ae2d8db24504d1943824d0da') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index fdb38c7e6..b05d0b8cf 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166245 2012-09-05 18:30:56Z andrea $ +# $Id: PKGBUILD 167808 2012-10-03 14:42:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('a5c817949b35f8001a2489d0fabadddcbc7646df') +sha1sums=('a68b02fd9ba765bce5d95b754dfd7eef70fa5743') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index dee194428..a54425cfd 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166246 2012-09-05 18:31:01Z andrea $ +# $Id: PKGBUILD 167809 2012-10-03 14:42:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('3b07235ff8aa419cc6971c14791e56a15c10d39a') +sha1sums=('6c11cf05fca993b7ddb7f92f68299a34470b5cd5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index f23d9f2fe..d89b73500 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166247 2012-09-05 18:31:06Z andrea $ +# $Id: PKGBUILD 167810 2012-10-03 14:43:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('ab4382d1b463569eba87efc7fbf9b12d08b236a7') +sha1sums=('13b3d40b0d33b1a60b36278760e35f337089cc73') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 14f3cd003..9d565ffd2 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166248 2012-09-05 18:31:12Z andrea $ +# $Id: PKGBUILD 167811 2012-10-03 14:43:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('0a1b4228cc05d8bf185af5a929e864c541f6e0bf') +sha1sums=('86b4bd5f4b7ccc4f6e0769a8360e55ffebdc2eaf') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 5152b1264..3359c8188 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166249 2012-09-05 18:31:17Z andrea $ +# $Id: PKGBUILD 167812 2012-10-03 14:43:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('f52621b525ba2d2598fc119cb121e96780c87f60') +sha1sums=('177413e9f9e490a4c72d8f85d3bdd36ffd1ba934') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index c33090942..e6651994b 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166250 2012-09-05 18:31:23Z andrea $ +# $Id: PKGBUILD 167813 2012-10-03 14:43:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('7118af5ce1a66c79fd0439b9aa249169ef63b2cd') +sha1sums=('66fba97fc152925f87551be2dd283d4cbf06683f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 014575c70..a34af026e 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166251 2012-09-05 18:31:28Z andrea $ +# $Id: PKGBUILD 167814 2012-10-03 14:43:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('ee07f3cd1141990a1c6bd9ad655413a8d74d8df9') +sha1sums=('144409ebfb2a2c3d040ab4a1ad130b5677dd23b6') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 8f731cb3e..89ea12e6f 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166252 2012-09-05 18:31:33Z andrea $ +# $Id: PKGBUILD 167815 2012-10-03 14:43:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('a4203a226d3b02b5619efd01291816f1b4de2b50') +sha1sums=('99133b52b29a7ee4d3dd6da664ad8c47fd637b71') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index c367e7023..2e88ad891 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166253 2012-09-05 18:31:38Z andrea $ +# $Id: PKGBUILD 167816 2012-10-03 14:43:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('c3ee656a8ca0fb4b75e810453e88f5fe30466de3') +sha1sums=('c30e80f71dc622b818d6539054f91584b0dce444') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 697b3b120..d797f12ed 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166254 2012-09-05 18:31:43Z andrea $ +# $Id: PKGBUILD 167817 2012-10-03 14:43:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('66d66016c7cb708aeb436861a647716fcde39028') +sha1sums=('53c702a88bd9cb0c8fba54d6353d06005760bd71') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index bc16a2517..4822deb73 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166219 2012-09-05 18:28:42Z andrea $ +# $Id: PKGBUILD 167781 2012-10-03 14:40:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('5975a99ef55b418b709279c95ff9afe01cf64264') +sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028') build() { cd "${srcdir}" diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index aaaaf809a..723c88ebb 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166255 2012-09-05 18:31:48Z andrea $ +# $Id: PKGBUILD 167818 2012-10-03 14:43:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('f109037b7960d0e14e23726e7edbbf0bf430b764') +sha1sums=('8ed40356ee7df8059935e945e070667dfffcc77b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index f2792e837..7ffa8d1d0 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166256 2012-09-05 18:31:53Z andrea $ +# $Id: PKGBUILD 167819 2012-10-03 14:43:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('8ca16eed35b87ce2416bb715dc392207198f802c') +sha1sums=('397e58d783f75f48e8cf5a3a35f1fa441010b50b') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 8104ab064..b139bb757 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166257 2012-09-05 18:31:56Z andrea $ +# $Id: PKGBUILD 167820 2012-10-03 14:43:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('92547f7b3402763395bef93ce43411a381694ffb') +sha1sums=('8c3ba1c2b15a795147110f246853217d301f903b') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 305b7e536..4c30b65da 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166258 2012-09-05 18:32:02Z andrea $ +# $Id: PKGBUILD 167821 2012-10-03 14:44:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('87667ac074e6ac924e8b7123969796f5e61ec2d3') +sha1sums=('7545eee07323935773466cfd3a241fbd8786ef13') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 00e623045..c9ca5192b 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166259 2012-09-05 18:32:27Z andrea $ +# $Id: PKGBUILD 167822 2012-10-03 14:44:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,7 +9,6 @@ pkgname=('kdegames-bomber' 'kdegames-kajongg' 'kdegames-kapman' 'kdegames-katomic' - 'kdegames-kbattleship' 'kdegames-kblackbox' 'kdegames-kblocks' 'kdegames-kbounce' @@ -25,6 +24,7 @@ pkgname=('kdegames-bomber' 'kdegames-klickety' 'kdegames-kmahjongg' 'kdegames-kmines' + 'kdegames-knavalbattle' 'kdegames-knetwalk' 'kdegames-kolf' 'kdegames-kollision' @@ -33,17 +33,17 @@ pkgname=('kdegames-bomber' 'kdegames-kreversi' 'kdegames-kshisen' 'kdegames-ksirk' + 'kdegames-ksnakeduel' 'kdegames-kspaceduel' 'kdegames-ksquares' 'kdegames-ksudoku' - 'kdegames-ktron' 'kdegames-ktuberling' 'kdegames-kubrick' 'kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('5fc77f230cff0a9b243403affc176e4e4757a1e7') +sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3') build() { cd $srcdir @@ -123,12 +123,14 @@ package_kdegames-katomic() { make DESTDIR=$pkgdir install } -package_kdegames-kbattleship() { - pkgdesc='Battleship Game' +package_kdegames-knavalbattle() { + pkgdesc='Naval Battle' depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbattleship/" - install='kdegames-kbattleship.install' - cd $srcdir/build/kbattleship + url="http://kde.org/applications/games/knavalbattle/" + install='kdegames-knavalbattle.install' + replaces=('kdegames-kbattleship') + conflicts=('kdegames-kbattleship') + cd $srcdir/build/knavalbattle make DESTDIR=$pkgdir install } @@ -369,12 +371,14 @@ package_kdegames-ksudoku() { make DESTDIR=$pkgdir install } -package_kdegames-ktron() { - pkgdesc='Tron-like Game' +package_kdegames-ksnakeduel() { + pkgdesc='Snake-like Game' depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktron/" + url="http://kde.org/applications/games/ksnakeduel/" install='kdegames.install' - cd $srcdir/build/ktron + replaces=('kdegames-ktron') + conflicts=('kdegames-ktron') + cd $srcdir/build/ksnakeduel make DESTDIR=$pkgdir install } diff --git a/extra/kdegames/kdegames-knavalbattle.install b/extra/kdegames/kdegames-knavalbattle.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/extra/kdegames/kdegames-knavalbattle.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 2809d97bd..11e909491 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166260 2012-09-05 18:32:33Z andrea $ +# $Id: PKGBUILD 167823 2012-10-03 14:44:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('5bc7a7da59e17e19f7f5e52648635b5b3bf77a22') +sha1sums=('5a48c195d4c305f166b2d9fc1a483457c4698156') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index bdd21b999..5a02a6b12 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166261 2012-09-05 18:32:36Z andrea $ +# $Id: PKGBUILD 167824 2012-10-03 14:44:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('6f032fd551d68b406749e1890d8ee15993a240ac') +sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 896b9c70b..f3c2d41c4 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166262 2012-09-05 18:32:42Z andrea $ +# $Id: PKGBUILD 167825 2012-10-03 14:44:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('ec7dd7928b72dee38455315fd15e569d11f3cf1c') +sha1sums=('7e34705505140cc3e6085fc057365ce4cab2c0a0') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index f1f0dd85a..216cf6eaa 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166263 2012-09-05 18:32:45Z andrea $ +# $Id: PKGBUILD 167826 2012-10-03 14:44:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('b38bfb571e13dc5a6db389b2980e130b85a874c6') +sha1sums=('553d40c87000c57a10f64f01313ca519148530da') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index d909439fb..fc52da4e2 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166264 2012-09-05 18:32:51Z andrea $ +# $Id: PKGBUILD 167827 2012-10-03 14:44:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('80d14586a889bd57e522321a863ac11b990b8982') +sha1sums=('a7a8fb6c63dc87e239bb54c2f178d2d5412296f3') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 8a32d059e..25422a0fa 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166265 2012-09-05 18:32:56Z andrea $ +# $Id: PKGBUILD 167828 2012-10-03 14:45:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('37855f2bae3ac92c15c4563c85e4e70a129aeb76') +sha1sums=('59fe8c2246d3d7e8c8307a4d72fae78caec20681') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 66253015c..85fcd0893 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166266 2012-09-05 18:32:59Z andrea $ +# $Id: PKGBUILD 167829 2012-10-03 14:45:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('832ed50f5f858cea1984050a297fd3a9da3691aa') +sha1sums=('91b1ef55620bc621a81d0e75643e47d0a115e524') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index c11c73ee8..fc802be8e 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166267 2012-09-05 18:33:04Z andrea $ +# $Id: PKGBUILD 167830 2012-10-03 14:45:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('e3941822f70df00aeede53481db4123aeb27e7a9') +sha1sums=('3496d070420f8aff10e69c98728c5c1ca34f6d47') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 66bee01d7..7357d10f6 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166268 2012-09-05 18:33:09Z andrea $ +# $Id: PKGBUILD 167831 2012-10-03 14:45:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7361731d3d69acba9aeab3b9d16bb2a2e4c3a547') +sha1sums=('81590d0958cebc3a052a4d973334f3fe4a9eabe4') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 70f76b709..22771c805 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166208 2012-09-05 18:27:20Z andrea $ +# $Id: PKGBUILD 167768 2012-10-03 14:39:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('d192961e5990f3bab323df77c9fed92262936279') +sha1sums=('2260afa2f0b7bf6afb2da5129fefd95b144dcd74') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index bfa326666..213d6706f 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166269 2012-09-05 18:33:12Z andrea $ +# $Id: PKGBUILD 167832 2012-10-03 14:45:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('254c64c37cc672934024475918d86184e0357895') +sha1sums=('d9923f5e52fc58c50bf83d7854ce1ec615407753') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index ae46cd93a..90e1d52a5 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166270 2012-09-05 18:33:16Z andrea $ +# $Id: PKGBUILD 167833 2012-10-03 14:45:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 -pkgdesc="A KPart for viewving SVGs" +pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('92eecdc27174f4e9032f62ef166e09f54a81fb4c') +sha1sums=('06584ae6652d0ea2265c47599dbb6789c973f1fc') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 375f6a584..7ab95847b 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166271 2012-09-05 18:33:19Z andrea $ +# $Id: PKGBUILD 167835 2012-10-03 14:45:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('b58497a68c5524c04a25fcde2e6d3617bc50a2aa') +sha1sums=('c87d00fa6af8fd1d57b0da74cdb382dd7d6f5311') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 30662365f..37cf2eb1b 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166272 2012-09-05 18:33:23Z andrea $ +# $Id: PKGBUILD 167836 2012-10-03 14:45:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('62049d902cc3b454ba4096e889482f341841240f') +sha1sums=('822b2a151cb03cdf2708d3731a07b0fa23ee8e34') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index c23e31384..a71078c64 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166273 2012-09-05 18:33:28Z andrea $ +# $Id: PKGBUILD 167837 2012-10-03 14:45:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('4e228d66185fbbcc8846f0d69074e9509909287e') +sha1sums=('ebe0021892c76f2b7ffd637ebf035801851ed3b5') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 4838ad2f1..b96bac5da 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166274 2012-09-05 18:33:31Z andrea $ +# $Id: PKGBUILD 167838 2012-10-03 14:45:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('dea7f81eba98e98d040062945a25c5f6c3651c65') +sha1sums=('a0083c2cda9c194663676b70beb6d23dba0d4f1d') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 598fd5c51..f0739be03 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166275 2012-09-05 18:33:36Z andrea $ +# $Id: PKGBUILD 167839 2012-10-03 14:45:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('9fa4ac409da7d2386c51e3d92a63ef1996562259') +sha1sums=('64e0c7ea030434cba9bdc9db05901aa81e1aaa97') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index c1c59ee19..8266c18c7 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166276 2012-09-05 18:33:41Z andrea $ +# $Id: PKGBUILD 167840 2012-10-03 14:45:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('43f6e8b635c9662bc930f31680d84ad0e5c0dd6a') +sha1sums=('581955c6a097c69f3cf511a6c55c58d2d2d9ceb7') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index 00823f222..26a42117d 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166277 2012-09-05 18:33:46Z andrea $ +# $Id: PKGBUILD 167841 2012-10-03 14:46:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('9cd9feef981bcbbb6f55d606a80abd2ef5635294') +sha1sums=('9130d1f35713f5ebb2f81a4f1b91f3fe16f18861') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index fea9af997..b39e28c2e 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166278 2012-09-05 18:33:49Z andrea $ +# $Id: PKGBUILD 167842 2012-10-03 14:46:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('f3f8b48b5c98e47bba0ed5df26f2543dacb07b4c') +sha1sums=('a70d8f522d31529444ba957cdadd97c22dab7090') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 9e4844f8c..6fc2a9380 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166735 2012-09-17 09:38:37Z andrea $ +# $Id: PKGBUILD 167843 2012-10-03 14:46:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.9.1 -pkgrel=3 +pkgver=4.9.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') +sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 83953bd54..c6e87355c 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166205 2012-09-05 18:27:06Z andrea $ +# $Id: PKGBUILD 167765 2012-10-03 14:39:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('bb39a81f9cf909c84807a003c77b1db9d3a1730b') +sha1sums=('4eeef5c706ea786d35ebaddf6c46084cf666680a') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 68928ec1c..ce5809eed 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166280 2012-09-05 18:34:22Z andrea $ +# $Id: PKGBUILD 167844 2012-10-03 14:46:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-build.patch') -sha1sums=('0fe7ade5d525ed60310f228570de75cbbceac46b' +sha1sums=('49e33e54e61bc499e54cdcd3470719cb4c22d2be' '974056ad2c3a00b33a8ac9403b369ab636000832') build() { diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 78e103f40..683cb79c5 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166200 2012-09-05 18:26:45Z andrea $ +# $Id: PKGBUILD 167759 2012-10-03 14:38:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('28d1fdbba5136a09445cad2b83d3a31c4e05e284') +sha1sums=('247820f8f8de5bcd66e19c45afc2033e50f0fd01') build() { cd "${srcdir}" diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 85776260f..e3fa6d221 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166281 2012-09-05 18:34:33Z andrea $ +# $Id: PKGBUILD 167845 2012-10-03 14:46:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -84,7 +84,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('2be00830e0e7e030240ca897ec1d9f9978fd8682') +sha1sums=('9f6493d52beb2ed723038e60f5f9ab53beec4e44') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index bb34f3a98..baa7f3272 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 166209 2012-09-05 18:27:32Z andrea $ +# $Id: PKGBUILD 167771 2012-10-03 14:39:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('a3a1e0f56e22ca87d5b65768ef4874a43ce3ae71' +sha1sums=('d3a1f58a5207b305e62a2a3dc7a34802289be42e' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 6404c0b4e..5fdc3e240 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166282 2012-09-05 18:34:56Z andrea $ +# $Id: PKGBUILD 167846 2012-10-03 14:47:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('319ebe0f912626b8d3539bc22d706cc2548723af' +sha1sums=('8acefc3701f12834b1e5606b635aef4b500e0aee' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 2b2bad013..dbaea88f5 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166283 2012-09-05 18:35:02Z andrea $ +# $Id: PKGBUILD 167847 2012-10-03 14:47:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('caa6a3222dccfb1b12513135e2f859904e385d7f') +sha1sums=('fe26e217edb2bc88ee3510bbe2fd32c3acd941b6') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 2c89d6661..669cc85f5 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166285 2012-09-05 18:35:14Z andrea $ +# $Id: PKGBUILD 167849 2012-10-03 14:47:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('498a43e08a02e41dc36f0032c8a18f7e054c6cc6') +sha1sums=('f1d4c7604fb94a4bbe36e136955dd5f6f0f1fdf1') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 1723028ed..4b4c01d0b 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166286 2012-09-05 18:35:19Z andrea $ +# $Id: PKGBUILD 167850 2012-10-03 14:47:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('40eacf20d6c0ba278670a6383e42ab94e78530d1') +sha1sums=('f28ed638e433c26e43c7e57e0193cdec67de9f22') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 24ac377a7..f215018fd 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166287 2012-09-05 18:35:22Z andrea $ +# $Id: PKGBUILD 167851 2012-10-03 14:47:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('1f8e70c69e63cdc9bd55b63eab5a90dcd81826ba') +sha1sums=('77f9077f2ec75de8f764140306c63c1a79888d33') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index 55c46c2b7..5a16a0c77 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166288 2012-09-05 18:35:28Z andrea $ +# $Id: PKGBUILD 167852 2012-10-03 14:47:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('1466bbfe715ff6e7a2129fbb5c6a42affbc48b16') +sha1sums=('022151b4f2170411037be31d2bbf9ce26f003313') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 57ab3c5f3..73a0a3ec2 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166289 2012-09-05 18:35:33Z andrea $ +# $Id: PKGBUILD 167853 2012-10-03 14:47:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('9559d03483aaab1774dbf26fa7171f6b697774b0') +sha1sums=('dbf5ceed22cd0ef0d898dacc466ea6db3da7c980') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 41b17d031..8233c5677 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166290 2012-09-05 18:35:38Z andrea $ +# $Id: PKGBUILD 167854 2012-10-03 14:47:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('9f1e181839c88485912beb013e0908b0e59877a3') +sha1sums=('2ec3ceb0d623ce1c2345025292a8a3c2e6b9923a') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 5b702f0b8..41814687c 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('046345fe3fb01c264ac3161a376f79f851cd51f5') +sha1sums=('142a28d72f07690a5b342c554493fcfb2e7ae6b5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index d20d16bfb..b5ada2bf2 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166292 2012-09-05 18:35:48Z andrea $ +# $Id: PKGBUILD 167856 2012-10-03 14:48:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('6fdcea3ce24b41d04baf9ca4a244035488b01197') +sha1sums=('e621ca273d1cb2490f9212f3c2ecf8d57a6efdd3') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 873509cef..e8ad2069c 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166293 2012-09-05 18:35:53Z andrea $ +# $Id: PKGBUILD 167857 2012-10-03 14:48:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('da1eef2fcb729fbcd28adeac486fedfc16175be2') +sha1sums=('e77e2cbf91f14e95ccd45fb1931df274f6c68cc7') build() { cd "${srcdir}" diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index fb9580890..7e33f0557 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166295 2012-09-05 18:36:01Z andrea $ +# $Id: PKGBUILD 167860 2012-10-03 14:48:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('0a1f43ab28cc351ab99f2aaf6cb5061c4136daa7') +sha1sums=('3e2e42316fe7ac357c58fbfa1e1387c347c31b30') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index d3d236502..92e53e1d2 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166296 2012-09-05 18:36:04Z andrea $ +# $Id: PKGBUILD 167861 2012-10-03 14:48:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('e64550d8fc5d5b5615eb464d9542167f0b5e17f3') +sha1sums=('31732ac3dd0be4864f6db9a7810b67a1634fc57d') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index a927c0312..3ab8ca69d 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166297 2012-09-05 18:36:12Z andrea $ +# $Id: PKGBUILD 167862 2012-10-03 14:48:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('0a64286114c10c3b09c64d1829058b9ab667986b') +sha1sums=('b811adaa5e996d9f588215be411a6a8d07f493ef') build() { cd $srcdir diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index e2b2fe5f7..e67d70ae4 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166225 2012-09-05 18:29:15Z andrea $ +# $Id: PKGBUILD 167788 2012-10-03 14:41:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7c2009bfb19a36cc5084ac450f5a2155a193da55') +sha1sums=('11a83fcf8e699d787b0c037e50f2031874470d70') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index 10a339a22..1f84c5fe3 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166226 2012-09-05 18:29:19Z andrea $ +# $Id: PKGBUILD 167789 2012-10-03 14:41:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5e35ecf40225c79e023c0a4eb28f94043e9a2a61') +sha1sums=('daea966e1d6bc06b3dc7001455e31f5004a05423') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index f0e54736e..ed57e15d4 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166220 2012-09-05 18:28:48Z andrea $ +# $Id: PKGBUILD 167782 2012-10-03 14:40:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('82911b0bf93a7762130e4a1aff4dc72ec48940c1') +sha1sums=('022e5e59fb4b0a9ac7942b967f488795a42786e0') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index ca131c4dd..8957699de 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166218 2012-09-05 18:28:37Z andrea $ +# $Id: PKGBUILD 167780 2012-10-03 14:40:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d472434ac86c2ca92318c9d5e24625d2a72fe654') +sha1sums=('e03310dbb1bcc02095f238fbdd4684a59e98d710') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 238222fd2..ed078f7f6 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166221 2012-09-05 18:28:54Z andrea $ +# $Id: PKGBUILD 167783 2012-10-03 14:40:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fec413daf7ad814299fb53db695c273b1c26bc3b') +sha1sums=('60956d88677346bdd4e343b1454a61a2210a39c6') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 93b90ea44..d768ff29b 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('8fb561ef477b6a35c264ada783f65efa2ae1d3b9') +sha1sums=('36d9bd240409e4ec3063fe02279671502fb65c26') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index ace88b054..815121e7d 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166223 2012-09-05 18:29:06Z andrea $ +# $Id: PKGBUILD 167786 2012-10-03 14:41:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c44eed9ec5f998d0449369f3c1b1abfc4ad2fcfd') +sha1sums=('e8578ec3a65ba91a8772c88612f61116ee9f38a8') build() { cd "${srcdir}" diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 2606aa16c..24a9ac5df 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162307 2012-06-24 20:44:52Z eric $ +# $Id: PKGBUILD 167697 2012-10-03 05:10:48Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff -pkgver=4.0.2 +pkgver=4.0.3 pkgrel=1 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('freeglut') optdepends=('freeglut: for using tiffgt') options=('!libtool') source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('d84b7b33a6cfb3d15ca386c8c16b05047f8b5352') +sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0') build() { cd "${srcdir}/tiff-${pkgver}" @@ -23,7 +23,7 @@ build() { check() { cd "${srcdir}/tiff-${pkgver}" - make check +# make check } package() { diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index ff3419d74..898cdb05a 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,20 +1,26 @@ -# $Id: PKGBUILD 166202 2012-09-05 18:26:52Z andrea $ +# $Id: PKGBUILD 167761 2012-10-03 14:39:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.9.1 -pkgrel=1 +pkgver=4.9.2 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1dbb4467b7d4ec50133e5ce86c3837b57b95794d') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'regression-crash.patch') +sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b' + 'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee') build() { - cd "${srcdir}" + # KDEBUG 307388 + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/regression-crash.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/nepomuk-core/regression-crash.patch b/extra/nepomuk-core/regression-crash.patch new file mode 100644 index 000000000..2559c99c4 --- /dev/null +++ b/extra/nepomuk-core/regression-crash.patch @@ -0,0 +1,73 @@ +From: David Faure <faure@kde.org> +Date: Tue, 02 Oct 2012 18:27:03 +0000 +Subject: Fix crash when watchUserLimitReached() leads to deleting the KInotify instance +X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=804e54f83ade8a377d392d350981ead07f60a9d3 +--- +Fix crash when watchUserLimitReached() leads to deleting the KInotify instance + +... which emitted the signal. So don't use a direct delete. + +BUG: 307388 +FIXED-IN: 4.9.3 +--- + + +--- a/services/filewatch/nepomukfilewatch.cpp ++++ b/services/filewatch/nepomukfilewatch.cpp +@@ -323,7 +323,8 @@ + void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached() + { + // we do it the brutal way for now hoping with new kernels and defaults this will never happen +- delete m_dirWatch; ++ // Delete the KInotify and switch to KDirNotify dbus signals ++ m_dirWatch->deleteLater(); + m_dirWatch = 0; + connectToKDirWatch(); + } + +From: Dan Vrátil <dvratil@redhat.com> +Date: Wed, 03 Oct 2012 11:27:22 +0000 +Subject: Add null-crash guards for m_dirWatch to FileWatch +X-Git-Url: http://quickgit.kde.org/?p=nepomuk-core.git&a=commitdiff&h=32b44881dda4f243932c59c11bf39c91f30c224b +--- +Add null-crash guards for m_dirWatch to FileWatch + +BUG: 307388 +--- + + +--- a/services/filewatch/nepomukfilewatch.cpp ++++ b/services/filewatch/nepomukfilewatch.cpp +@@ -114,6 +114,7 @@ + + Nepomuk2::FileWatch::FileWatch( QObject* parent, const QList<QVariant>& ) + : Service( parent ) ++ , m_dirWatch( 0 ) + { + // Create the configuration instance singleton (for thread-safety) + // ============================================================== +@@ -324,8 +325,10 @@ + { + // we do it the brutal way for now hoping with new kernels and defaults this will never happen + // Delete the KInotify and switch to KDirNotify dbus signals +- m_dirWatch->deleteLater(); +- m_dirWatch = 0; ++ if( m_dirWatch ) { ++ m_dirWatch->deleteLater(); ++ m_dirWatch = 0; ++ } + connectToKDirWatch(); + } + #endif +@@ -413,7 +416,9 @@ + void Nepomuk2::FileWatch::slotDeviceTeardownRequested(const Nepomuk2::RemovableMediaCache::Entry* entry ) + { + #ifdef BUILD_KINOTIFY +- m_dirWatch->removeWatch( entry->mountPath() ); ++ if( m_dirWatch ) { ++ m_dirWatch->removeWatch( entry->mountPath() ); ++ } + #endif + } + + diff --git a/extra/pycurl/PKGBUILD b/extra/pycurl/PKGBUILD new file mode 100644 index 000000000..ee7b516cf --- /dev/null +++ b/extra/pycurl/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167931 2012-10-03 20:46:27Z andrea $ +# Maintainer: +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> + +pkgbase=pycurl +pkgname=('python2-pycurl') +pkgver=7.19.0 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://pycurl.sourceforge.net/" +license=('GPL') +makedepends=('python2' 'curl') +source=("http://pycurl.sourceforge.net/download/${pkgbase}-${pkgver}.tar.gz") +md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b') + +package_python2-pycurl() { + pkgdesc="A Python 2.x interface to libcurl" + depends=('python2' 'curl') + replaces=('pycurl' 'python-pycurl') + provides=('pycurl' 'python-pycurl') + conflicts=('python-pycurl') + + cd ${pkgbase}-${pkgver} + python2 setup.py install --curl-config=/usr/bin/curl-config \ + --prefix "${pkgdir}"/usr --optimize=1 + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find "${pkgdir}" -name '*.py') +} diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index ce55b407c..9267fd226 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164651 2012-08-01 18:41:16Z andrea $ +# $Id: PKGBUILD 167929 2012-10-03 20:43:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') -pkgver=1.3.10 +pkgver=1.3.11 pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" @@ -13,8 +13,8 @@ license=('GPL') makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'libusb-compat' 'desktop-file-utils') source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) -md5sums=('9de9df07c4c97afa2cea3be2f05d6c18' - '8ef4287a04761bd0b96e8ec44a92c92c') +md5sums=('081fde89686ee15a9433c0035f5faed0' + '470964eb627af31f2aff9967a4b9a5bb') build() { cd "${srcdir}"/${pkgbase}-${pkgver} @@ -37,7 +37,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat') + depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python2-pycurl' 'libusb-compat') optdepends=('system-config-printer-gnome: for the GTK frontend' 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') replaces=('system-config-printer') diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 482306c67..22fb7d047 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165436 2012-08-19 10:42:24Z guillaume $ +# $Id: PKGBUILD 167701 2012-10-03 08:00:56Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -12,7 +12,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('5e3ea7eed50dace479e12f49d24506f4') +sha1sums=('3e1322eea5794c71de752b7923af9379bcc95299') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index c18d07110..eb3cd1e5b 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163788 2012-07-20 05:26:57Z eric $ +# $Id: PKGBUILD 167747 2012-10-03 14:08:02Z eric $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=zile -pkgver=2.4.8 +pkgver=2.4.9 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="http://www.gnu.org/software/zile/" license=('GPL3') depends=('acl' 'gc' 'ncurses') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('763224367472deecf71fb10d61806706a481fd48' - '3a3e0c039e12af62f0de1aae849c486606cd314a') +sha1sums=('f233487e2d0ce99d7670832d106d1a2503d4c925' + 'cfc6f526bd4f14e127b32f91ae3e414e58d722c3') build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD index 6afb17b84..4538f2a5e 100644 --- a/gnome-unstable/dconf/PKGBUILD +++ b/gnome-unstable/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167338 2012-10-01 13:33:25Z jgc $ +# $Id: PKGBUILD 167916 2012-10-03 20:02:18Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.13.90 +pkgver=0.14.0 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8661a45700d2530d1e07b735809a3a5e3df019cc8064f0f80919417fc59ee288') +sha256sums=('9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD index 86d9c1833..5f0197bcb 100644 --- a/gnome-unstable/empathy/PKGBUILD +++ b/gnome-unstable/empathy/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 167414 2012-10-01 23:46:18Z jgc $ +# $Id: PKGBUILD 167722 2012-10-03 11:30:17Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.6.0 +pkgver=3.6.0.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') url="http://live.gnome.org/Empathy" license=('GPL2') depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') -makedepends=('intltool' 'itstool' 'gnome-common') +makedepends=('intltool' 'itstool' 'docbook-xsl') optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' @@ -19,7 +19,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6bd73710846f369bc41fa0f88b3dd60d03f9242702b6a8c35681c9e5c99e8441') +sha256sums=('317933dca14ed3e402410cd2a4f0cba4d9a80fe43f3d4de110b6342fc43db315') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/evolution-ews/PKGBUILD b/gnome-unstable/evolution-ews/PKGBUILD new file mode 100644 index 000000000..004aeb10b --- /dev/null +++ b/gnome-unstable/evolution-ews/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 167902 2012-10-03 17:04:25Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=evolution-ews +pkgver=3.6.0 +pkgrel=1 +pkgdesc="MS Exchange integration through Exchange Web Services" +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://www.gnome.org" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a1d40971f47bfd947349f48a86f8a5ec7252db41b9b0d19204b4e28f2408a96a') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD new file mode 100644 index 000000000..348b60ec7 --- /dev/null +++ b/gnome-unstable/gedit/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 167879 2012-10-03 15:15:10Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gedit +pkgver=3.6.0 +pkgrel=1 +pkgdesc="A text editor for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gedit.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2043aaa61708222f476dd1c83e43bd17c67a341b30a4baa6466a60bbfb6d9471') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ + --enable-python + make +} + +package(){ + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gedit/gedit.install b/gnome-unstable/gedit/gedit.install new file mode 100644 index 000000000..606920688 --- /dev/null +++ b/gnome-unstable/gedit/gedit.install @@ -0,0 +1,18 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then + gconfpkg --uninstall gedit + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/glade/PKGBUILD b/gnome-unstable/glade/PKGBUILD new file mode 100644 index 000000000..cf8779f39 --- /dev/null +++ b/gnome-unstable/glade/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167894 2012-10-03 15:58:19Z jgc $ +# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=glade +pkgver=3.14.0 +pkgrel=1 +pkgdesc="User interface builder for GTK+ and GNOME." +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl') +optdepends=('python2: Python widgets support') +options=('!libtool') +url="http://glade.gnome.org/" +install=glade.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('8848d0ae3548e32a8ec385f50c15eb34ed7f13d7f451760d974a0858dbfe93b2') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/glade/glade.install b/gnome-unstable/glade/glade.install new file mode 100644 index 000000000..bce670aff --- /dev/null +++ b/gnome-unstable/glade/glade.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules index a76c1e73c..d7d9650dc 100644 --- a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules +++ b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules @@ -1,11 +1,7 @@ # Get access to /dev/rfkill for users # See https://bugzilla.redhat.com/show_bug.cgi?id=514798 # -# Updated for udev >= 154 -# http://bugs.debian.org/582188 -# https://bugzilla.redhat.com/show_bug.cgi?id=588660 +# Simplified by Kay Sievers +# https://bugzilla.redhat.com/show_bug.cgi?id=733326 -ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" -ACTION!="add|change", GOTO="gnome_bluetooth_end" -KERNEL=="rfkill", TAG+="udev-acl" -LABEL="gnome_bluetooth_end" +KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess" diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD index 9df4296a6..2061d3231 100644 --- a/gnome-unstable/gnome-bluetooth/PKGBUILD +++ b/gnome-unstable/gnome-bluetooth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167534 2012-10-02 10:33:21Z jgc $ +# $Id: PKGBUILD 167914 2012-10-03 19:43:31Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeBluetooth" @@ -16,7 +16,7 @@ install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306' - 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') + '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD index 189d66771..a6021f1f3 100644 --- a/gnome-unstable/gnome-disk-utility/PKGBUILD +++ b/gnome-unstable/gnome-disk-utility/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167542 2012-10-02 11:41:39Z jgc $ +# $Id: PKGBUILD 167922 2012-10-03 20:26:57Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=gnome-disk-utility.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0e3ccd8ae0f79a8ccc41bfaaf0f34c14fec7b193249e650862c589d82053e57d') +sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD index c6e032307..eb96f3475 100644 --- a/gnome-unstable/gnome-keyring/PKGBUILD +++ b/gnome-unstable/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 166815 2012-09-19 15:07:40Z jgc $ +#$Id: PKGBUILD 167712 2012-10-03 10:10:59Z jgc $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -14,7 +14,7 @@ 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') +sha256sums=('6a0de88d5e1778dd5026226cb2ff25bf8355f370b089daa58ee0887639fb0a20') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD index 2a1fda39e..95a3a8f6b 100644 --- a/gnome-unstable/gnome-menus/PKGBUILD +++ b/gnome-unstable/gnome-menus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167081 2012-09-25 09:50:30Z jgc $ +# $Id: PKGBUILD 167714 2012-10-03 10:12:02Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz menus.patch) -sha256sums=('e56022b4329e97fdcadf0c70212dba04c4da9c51be2036e6c931ab0fd48fef0f' +sha256sums=('523ac10729e28f9acde4785e61dcb895828fd89e39b38b68f6c14ec815805a0b' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { diff --git a/gnome-unstable/gnome-nettool/PKGBUILD b/gnome-unstable/gnome-nettool/PKGBUILD new file mode 100644 index 000000000..1ab02baea --- /dev/null +++ b/gnome-unstable/gnome-nettool/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 167877 2012-10-03 15:12:25Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Kritoke <kritoke@nospam.gmail.com> + +pkgname=gnome-nettool +pkgver=3.2.0 +pkgrel=1 +pkgdesc="A Collection of GNOME3 Networking Tools." +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') +makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') +optdepends=('nmap: Port scanning' + 'net-tools: Network statistics') +groups=('gnome-extra') +url="http://www.gnome.org" +install=gnome-nettool.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-nettool/gnome-nettool.install b/gnome-unstable/gnome-nettool/gnome-nettool.install new file mode 100644 index 000000000..e5dfaf4a5 --- /dev/null +++ b/gnome-unstable/gnome-nettool/gnome-nettool.install @@ -0,0 +1,12 @@ +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 $1 +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD new file mode 100644 index 000000000..c03259efa --- /dev/null +++ b/gnome-unstable/gnome-panel/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 167752 2012-10-03 14:30:00Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-panel +pkgver=3.6.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL') +pkgdesc="The GNOME Panel" +url="http://www.gnome.org" +depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' + 'gconf' 'telepathy-glib') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') +install=gnome-panel.install +groups=('gnome') +provides=("gnome-panel-bonobo=${pkgver}") +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6a8058df6263af35b0e430514f7e16d1b4df095365242d39e170cfc451a328b6') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-panel \ + --disable-scrollkeeper \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/gnome-panel/gnome-panel.install b/gnome-unstable/gnome-panel/gnome-panel.install new file mode 100644 index 000000000..0f9324937 --- /dev/null +++ b/gnome-unstable/gnome-panel/gnome-panel.install @@ -0,0 +1,24 @@ +pkgname=gnome-panel + +post_install() { + gconfpkg --install $pkgname + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/gnome-unstable/gnome-power-manager/PKGBUILD b/gnome-unstable/gnome-power-manager/PKGBUILD new file mode 100644 index 000000000..7e39538f6 --- /dev/null +++ b/gnome-unstable/gnome-power-manager/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 167704 2012-10-03 09:51:18Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-power-manager +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Power management tools." +arch=(i686 x86_64) +url="http://www.gnome.org/projects/gnome-power-manager/" +license=('GPL') +depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') +makedepends=('intltool') +options=(!emptydirs) +install=gnome-power-manager.install +groups=(gnome-extra) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-power-manager \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-power-manager/gnome-power-manager.install b/gnome-unstable/gnome-power-manager/gnome-power-manager.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/gnome-unstable/gnome-power-manager/gnome-power-manager.install @@ -0,0 +1,12 @@ +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-search-tool/PKGBUILD b/gnome-unstable/gnome-search-tool/PKGBUILD new file mode 100644 index 000000000..76258f361 --- /dev/null +++ b/gnome-unstable/gnome-search-tool/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167757 2012-10-03 14:37:08Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-search-tool +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Utility to search for files" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('gtk3' 'libsm') +makedepends=('intltool' 'yelp-tools') +install=$pkgname.install +options=('!emptydirs') +groups=('gnome-extra') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-search-tool/gnome-search-tool.install b/gnome-unstable/gnome-search-tool/gnome-search-tool.install new file mode 100644 index 000000000..b631b6a89 --- /dev/null +++ b/gnome-unstable/gnome-search-tool/gnome-search-tool.install @@ -0,0 +1,16 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +pre_upgrade() { + (( $(vercmp $2 3.6.0) < 0 )) && gconfpkg --uninstall gnome-search-tool + return 0 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD index 16f68f0f9..572a8dc8b 100644 --- a/gnome-unstable/gnome-shell/PKGBUILD +++ b/gnome-unstable/gnome-shell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167089 2012-09-25 10:46:37Z jgc $ +# $Id: PKGBUILD 167934 2012-10-03 21:44:44Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bf43ade818f2fd7631492a5eb61522524b7bdb84d3627a21bd4bde9100e0e6af') +sha256sums=('032ad32a4fa6c1f92010635e3076031323ac690f78c610184438c085c355e07b') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-terminal/PKGBUILD b/gnome-unstable/gnome-terminal/PKGBUILD new file mode 100644 index 000000000..b5c5f6bb8 --- /dev/null +++ b/gnome-unstable/gnome-terminal/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167769 2012-10-03 14:39:33Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-terminal +pkgver=3.6.0 +pkgrel=1 +pkgdesc="The GNOME Terminal Emulator" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm') +makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl') +options=('!emptydirs') +url="http://www.gnome.org" +groups=('gnome') +install=gnome-terminal.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/gnome-terminal/gnome-terminal.install b/gnome-unstable/gnome-terminal/gnome-terminal.install new file mode 100644 index 000000000..1d8510f06 --- /dev/null +++ b/gnome-unstable/gnome-terminal/gnome-terminal.install @@ -0,0 +1,17 @@ +pkgname=gnome-terminal + +post_install() { + gconfpkg --install $pkgname +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} diff --git a/gnome-unstable/gnome-user-share/PKGBUILD b/gnome-unstable/gnome-user-share/PKGBUILD new file mode 100644 index 000000000..db00ff47f --- /dev/null +++ b/gnome-unstable/gnome-user-share/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167785 2012-10-03 14:41:05Z heftig $ +# Maintainer: Roman Kyrylych <roman@archlinux.org> + +pkgname=gnome-user-share +pkgver=3.0.4 +pkgrel=1 +pkgdesc="Easy to use user-level file sharing for GNOME." +arch=('i686' 'x86_64') +url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" +license=('GPL') +depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl') +options=('!emptydirs' '!libtool') +install=gnome-user-share.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-user-share \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gnome-user-share/gnome-user-share.install b/gnome-unstable/gnome-user-share/gnome-user-share.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/gnome-unstable/gnome-user-share/gnome-user-share.install @@ -0,0 +1,12 @@ +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/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD index 2c518a867..71fc20159 100644 --- a/gnome-unstable/grilo-plugins/PKGBUILD +++ b/gnome-unstable/grilo-plugins/PKGBUILD @@ -1,30 +1,27 @@ -# $Id: PKGBUILD 167313 2012-09-30 23:18:47Z heftig $ +# $Id: PKGBUILD 167865 2012-10-03 14:50:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.0 -pkgrel=1 +pkgver=0.2.1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') -depends=('grilo') -makedepends=(gupnp-av libgdata libquvi sqlite gmime libgcrypt rest libtracker-sparql - totem-plparser gnome-common) +depends=('grilo' 'sqlite' 'libgcrypt') +makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin' 'sqlite: Podcasts plugin' 'gmime: Podcasts plugin' - 'sqlite: Bookmarks plugin' - 'sqlite: Metadata store plugin' - 'libgcrypt: Vimeo plugin' 'rest: Blip.tv plugin' 'libtracker-sparql: Tracker plugin' - 'totem-plparser: Optical media plugin') + 'totem-plparser: Optical media plugin' + 'libdmapsharing: DMAP sharing plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('86ecabe5b34a15e9c00285b599461e7eb590e2fff0a8b284157b789b192db4f7') +sha256sums=('d437e146bfdf7f2f4b6306131676f564f5ad02f904089e43b1b8a1f1fe99f895') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD index 63828fe1d..c286b345b 100644 --- a/gnome-unstable/grilo/PKGBUILD +++ b/gnome-unstable/grilo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167311 2012-09-30 23:10:51Z heftig $ +# $Id: PKGBUILD 167718 2012-10-03 10:21:01Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('daab3104684dd1a347aa3f3bc8e5a435f57829f594d951890692b9035c993d1f') +sha256sums=('eb225fb88389e018858869eb5da5aee9d72bdb2306979e8f3defb5fc898af676') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gssdp/PKGBUILD b/gnome-unstable/gssdp/PKGBUILD new file mode 100644 index 000000000..222da9525 --- /dev/null +++ b/gnome-unstable/gssdp/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 167730 2012-10-03 12:52:04Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=gssdp +pkgver=0.12.2.1 +pkgrel=1 +pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" +arch=('i686' 'x86_64') +url="http://gupnp.org/" +license=('LGPL') +depends=('libsoup') +makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') +optdepends=('gtk2: gssdp-device-sniffer') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gst-libav/PKGBUILD b/gnome-unstable/gst-libav/PKGBUILD new file mode 100644 index 000000000..e357d4435 --- /dev/null +++ b/gnome-unstable/gst-libav/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 167900 2012-10-03 16:39:25Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gst-libav +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Gstreamer libav Plugin" +arch=('i686' 'x86_64') +license=('GPL') +url="http://gstreamer.freedesktop.org/" +depends=('gst-plugins-base-libs' 'bzip2') +makedepends=('yasm') +options=(!libtool !emptydirs) +provides=("gst-ffmpeg=$pkgver-pkgrel") +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('49c8b54eaae25da2c866a59b284b31ea') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ + --with-package-name="GStreamer libav Plugin (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gst-plugins-ugly/PKGBUILD b/gnome-unstable/gst-plugins-ugly/PKGBUILD new file mode 100644 index 000000000..2ec191bf7 --- /dev/null +++ b/gnome-unstable/gst-plugins-ugly/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 167899 2012-10-03 16:36:51Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gst-plugins-ugly +pkgver=1.0.0 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Ugly Plugins" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +options=(!libtool !emptydirs) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) + #opencore-amr.patch) +md5sums=('7f20303caf4305278573fb7ef73a07b7') + #'d8feb6c99bfaff8be6b2c48ea4e98e47') + +build() { + cd $pkgname-$pkgver + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf + #patch -Np0 -i "${srcdir}/opencore-amr.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD new file mode 100644 index 000000000..6af778627 --- /dev/null +++ b/gnome-unstable/gthumb/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 167923 2012-10-03 20:33:57Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gthumb +pkgver=3.1.1 +pkgrel=1 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/gthumb" +depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' + 'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp') +makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' + 'brasero' 'librsvg' 'libopenraw' 'liboauth') +optdepends=('libopenraw: read RAW files' + 'exiv2: metadata support' + 'libchamplain: map viewer' + 'brasero: burn discs' + 'libsoup-gnome: web albums' + 'liboauth: web albums') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7e725ba38d1220ed09d0657dd365982547856aa0d03c775891de33d04c31e332') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-libchamplain --enable-libopenraw + + 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/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install new file mode 100644 index 000000000..9d4e7822f --- /dev/null +++ b/gnome-unstable/gthumb/gthumb.install @@ -0,0 +1,19 @@ +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 (( $(vercmp $2 2.90.1) < 0 )); then + gconfpkg --uninstall gthumb + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD index 8c03cb8e1..c2416d321 100644 --- a/gnome-unstable/gtksourceview3/PKGBUILD +++ b/gnome-unstable/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167022 2012-09-24 19:12:48Z jgc $ +# $Id: PKGBUILD 167744 2012-10-03 14:04:40Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.5.4 +pkgver=3.6.0 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('7f3bbccf4b6b91c9a2c7ac14957876970fe305e5903a2d15ca81dd507835df3b') +sha256sums=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a') build() { cd "$_pkgbasename-$pkgver" diff --git a/gnome-unstable/gucharmap/PKGBUILD b/gnome-unstable/gucharmap/PKGBUILD new file mode 100644 index 000000000..0a1caaa33 --- /dev/null +++ b/gnome-unstable/gucharmap/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167740 2012-10-03 13:27:33Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan De Groot <jgc@archlinux.org> + +pkgname=gucharmap +pkgver=3.5.99 +pkgrel=1 +pkgdesc="Gnome Unicode Charmap" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +depends=('dconf' 'gtk3' 'hicolor-icon-theme') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') +options=('!libtool' '!emptydirs') +install=gucharmap.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('0f439539e6ed3fa84a8775d27c8082410652124cb124437ff4b21432f47b8864') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile --enable-introspection + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gucharmap/gucharmap.install b/gnome-unstable/gucharmap/gucharmap.install new file mode 100644 index 000000000..0a9ddf4c2 --- /dev/null +++ b/gnome-unstable/gucharmap/gucharmap.install @@ -0,0 +1,17 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap + return 0 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gupnp/PKGBUILD b/gnome-unstable/gupnp/PKGBUILD new file mode 100644 index 000000000..31020ff1f --- /dev/null +++ b/gnome-unstable/gupnp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167735 2012-10-03 13:16:53Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=gupnp +pkgver=0.18.4 +pkgrel=1 +pkgdesc="An object-oriented UPNP framework" +arch=('i686' 'x86_64') +url="http://gupnp.org/" +license=('LGPL') +depends=('gssdp' 'util-linux') +makedepends=('gobject-introspection' 'gtk-doc') +optdepends=('python2: gupnp-binding-tool') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1') + +build() { + cd $pkgname-$pkgver + sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-context-manager=linux + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libcroco/PKGBUILD b/gnome-unstable/libcroco/PKGBUILD new file mode 100644 index 000000000..2354aadb1 --- /dev/null +++ b/gnome-unstable/libcroco/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 167716 2012-10-03 10:14:48Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libcroco +pkgver=0.6.6 +pkgrel=1 +pkgdesc="A CSS parsing library" +arch=('x86_64' 'i686') +depends=('glib2' 'libxml2') +makedepends=('intltool') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('72ecace2f3d016a25f2b923c6d0cc76cced823e94171692c533f6c2088086bd9') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libgweather/PKGBUILD b/gnome-unstable/libgweather/PKGBUILD index fca60cd53..13cfb55a9 100644 --- a/gnome-unstable/libgweather/PKGBUILD +++ b/gnome-unstable/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166809 2012-09-19 14:43:44Z jgc $ +# $Id: PKGBUILD 167732 2012-10-03 12:52:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ 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' +sha256sums=('93c9ef9bba3feb559c02b860909915fa9ffc7c08b4789a825939236e3e84b676' '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533' 'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672') diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD index 3c653cb3b..77ee2a0a3 100644 --- a/gnome-unstable/libpeas/PKGBUILD +++ b/gnome-unstable/libpeas/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166436 2012-09-07 19:19:46Z jgc $ +# $Id: PKGBUILD 167720 2012-10-03 10:23:54Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('f5ccc0f4e0b24db273d5e11d161494a6751dd2178813b9d98832dac0a049b0bb') +sha256sums=('23c1385cba2e32201588c988ea6894b27a115efc01cb4acb927e984456ffd63c') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD index b2f689f1f..e71f44b8f 100644 --- a/gnome-unstable/mutter/PKGBUILD +++ b/gnome-unstable/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166811 2012-09-19 14:53:55Z jgc $ +# $Id: PKGBUILD 167751 2012-10-03 14:23:30Z heftig $ # 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 +pkgver=3.6.0 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0b745e25ae5243eb98f7b19adb7fd596c75d40d318a1b1288be0b6ecd8f3f825') +sha256sums=('002a7b6f0cbe054c6701cf9fcbff744494dbf49db9cbea5f8df75dbf1b752c07') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/nautilus-open-terminal/PKGBUILD b/gnome-unstable/nautilus-open-terminal/PKGBUILD new file mode 100644 index 000000000..bb24ee9eb --- /dev/null +++ b/gnome-unstable/nautilus-open-terminal/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167897 2012-10-03 16:24:35Z jgc $ +# Maintainer : Biru Ionut <ionut@archlinux.ro> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> +pkgname=nautilus-open-terminal +pkgver=0.19 +pkgrel=3 +pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths" +arch=('i686' 'x86_64') +url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal" +license=('GPL') +depends=('nautilus' 'gconf') +makedepends=('pkgconfig' 'gettext' 'intltool') +install=nautilus-open-terminal.install +source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -dm755 "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -rf "${pkgdir}"/etc/gconf/schemas +} diff --git a/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install b/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install new file mode 100644 index 000000000..f7cdb9507 --- /dev/null +++ b/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install @@ -0,0 +1,17 @@ +pkgname=nautilus-open-terminal + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/gnome-unstable/rhythmbox/PKGBUILD b/gnome-unstable/rhythmbox/PKGBUILD new file mode 100644 index 000000000..f81235e36 --- /dev/null +++ b/gnome-unstable/rhythmbox/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 167904 2012-10-03 17:54:55Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rhythmbox +pkgver=2.98 +pkgrel=1 +pkgdesc="An iTunes-like music playback and management application" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.rhythmbox.org" +depends=('dconf' 'desktop-file-utils' 'grilo' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' + 'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas' 'libwebkit3' + 'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser' + 'tdb' 'libdiscid') +makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala') +optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'brasero: cd burning') +options=('!libtool' '!emptydirs') +install=rhythmbox.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/rhythmbox \ + --localstatedir=/var --disable-static \ + --enable-daap --enable-python --enable-vala \ + --with-mdns=avahi --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins" +} diff --git a/gnome-unstable/rhythmbox/rhythmbox.install b/gnome-unstable/rhythmbox/rhythmbox.install new file mode 100644 index 000000000..e02ee2c16 --- /dev/null +++ b/gnome-unstable/rhythmbox/rhythmbox.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD new file mode 100644 index 000000000..92488c782 --- /dev/null +++ b/gnome-unstable/seahorse/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 167873 2012-10-03 15:09:25Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Michel Brabants <michel.linux@tiscali.be> + +pkgname=seahorse +pkgver=3.6.0 +pkgrel=1 +pkgdesc="GNOME application for managing PGP keys." +arch=(i686 x86_64) +license=(GPL) +url="http://projects.gnome.org/seahorse/" +depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf) +makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm) +optdepends=('openssh: SSH support') +provides=(x11-ssh-askpass) +options=('!libtool' '!emptydirs') +groups=(gnome-extra) +install=seahorse.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz + seahorse-ssh-askpass.sh) +sha256sums=('88a0bcaa3aeef6a9a2f2abf4c7ffbf94cef474b466d79d45054d19175d5ccee8' + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-ldap --enable-hkp \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ + "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" +} diff --git a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh b/gnome-unstable/seahorse/seahorse-ssh-askpass.sh new file mode 100644 index 000000000..04f79d8f2 --- /dev/null +++ b/gnome-unstable/seahorse/seahorse-ssh-askpass.sh @@ -0,0 +1,3 @@ +if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then + export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass +fi diff --git a/gnome-unstable/seahorse/seahorse.install b/gnome-unstable/seahorse/seahorse.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/gnome-unstable/seahorse/seahorse.install @@ -0,0 +1,13 @@ +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/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD new file mode 100644 index 000000000..e6649d299 --- /dev/null +++ b/gnome-unstable/totem/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 167895 2012-10-03 15:58:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgbase=totem +pkgname=('totem' 'totem-plugin') +pkgver=3.6.0 +pkgrel=1 +pkgdesc="GNOME3 movie player based on GStreamer" +url="http://www.gnome.org" +arch=(i686 x86_64) +license=(GPL2 custom) +depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas + hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst + clutter-gtk mx python2-gobject gst-plugins-bad) +makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint) +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + browser-plugins.ini) +sha256sums=('e767da34f5212bd9b2d3ea9bc7e3a87b284581ee012214274225dd8decb8fe3e' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/totem \ + --localstatedir=/var \ + --disable-static \ + --enable-python \ + --enable-nautilus + make +} + +package_totem() { + groups=(gnome-extra) + install=totem.install + optdepends=('gst-plugins-ugly: Extra media codecs' + 'gst-ffmpeg: Extra media codecs' + 'lirc-utils: Infrared Remote Control plugin' + 'grilo-plugins: Browse sidebar (remote media)' + 'pyxdg: opensubtitles plugin') + + cd "$pkgbase-$pkgver" + make DESTDIR="${pkgdir}" install + + rm -r "$pkgdir/usr/lib/mozilla" + rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" + + sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ + $pkgdir/usr/lib/totem/totem/totem-bugreport.py + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" +} + +package_totem-plugin() { + pkgdesc="Totem plugin for web browsers" + depends=("totem=$pkgver") + backup=(etc/totem/browser-plugins.ini) + + cd "$pkgbase-$pkgver" + make -C browser-plugin \ + plugindir=/usr/lib/mozilla/plugins \ + xptdir=/usr/lib/mozilla/plugins \ + DESTDIR="$pkgdir" install + + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" +} diff --git a/gnome-unstable/totem/browser-plugins.ini b/gnome-unstable/totem/browser-plugins.ini new file mode 100644 index 000000000..cf3014997 --- /dev/null +++ b/gnome-unstable/totem/browser-plugins.ini @@ -0,0 +1,2 @@ +[Plugins] +application/x-shockwave-flash.disabled=true diff --git a/gnome-unstable/totem/totem.install b/gnome-unstable/totem/totem.install new file mode 100644 index 000000000..7f0fc704b --- /dev/null +++ b/gnome-unstable/totem/totem.install @@ -0,0 +1,13 @@ +post_install() { + /usr/bin/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/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD new file mode 100644 index 000000000..a2764c0f6 --- /dev/null +++ b/gnome-unstable/vinagre/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 167867 2012-10-03 14:58:56Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <mcrae_allan@hotmail.com> +# Contributor: lp76 <l.peduto@gmail.com> + +pkgname=vinagre +pkgver=3.6.0 +pkgrel=1 +pkgdesc="A VNC Client for the GNOME Desktop" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/vinagre/" +install=vinagre.install +depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') +optdepends=('openssh: SSH plugin' + 'rdesktop: RDP plugin') +makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('4f75882d52308ccb241ef6d76061bad54a7e13e6549fe355faa2af994765f11d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/vinagre/vinagre.install b/gnome-unstable/vinagre/vinagre.install new file mode 100644 index 000000000..4998e6e8b --- /dev/null +++ b/gnome-unstable/vinagre/vinagre.install @@ -0,0 +1,14 @@ +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/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD new file mode 100644 index 000000000..6d7b74dd1 --- /dev/null +++ b/gnome-unstable/vino/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 167742 2012-10-03 13:54:15Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=vino +pkgver=3.6.0 +pkgrel=1 +pkgdesc="a VNC server for the GNOME desktop" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils') +makedepends=('intltool' 'networkmanager' 'gnome-common') +groups=('gnome-extra') +url="http://www.gnome.org" +options=(!emptydirs) +install=vino.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('590ef98a3a2c2e6eb698d8e55ec97c2755aa85839a35985bf2142b186dce91ef') + +build() { + cd $pkgname-$pkgver + sed -i -e '/AC_PATH_XTRA/d' -e 's/LIBSECRET_DEPS/SECRET_DEPS/g' configure.ac + autoreconf --force + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vino \ + --localstatedir=/var \ + --disable-http-server --with-secret + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/vino/vino.install b/gnome-unstable/vino/vino.install new file mode 100644 index 000000000..fabaa1ed7 --- /dev/null +++ b/gnome-unstable/vino/vino.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 7dbb749d7..8bd1c2022 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-utils' 'virtualbox-libre-guest-source') pkgver=4.2.0 -pkgrel=3 +pkgrel=3.2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -65,9 +65,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_gnewsense_64.png' 'os_gnewsense.png' 'os_gnu_64.png' - 'os_gnuhurd.png' - 'os_gnulinux_64.png' - 'os_gnulinux.png' 'os_gnu.png' 'os_musix_64.png' 'os_musix.png' @@ -101,9 +98,6 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' 'a49ed3ab6bd0fb084de0ab3dd97ae93e' '6b432b3305ed446125eef052c38355a6' 'a70022a468bd3e9daf01818d2d74ac3c' - '6b432b3305ed446125eef052c38355a6' - 'a70022a468bd3e9daf01818d2d74ac3c' - 'a70022a468bd3e9daf01818d2d74ac3c' '380eb2ab6cad3da198094585853c129c' 'a60bb9a98abcc3c34156f9051d00df9a' '3a908ef6952bcf987e63ef2fe4e98d24' @@ -114,7 +108,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '67cc4c8611890038eb3e4114ae899525' - '71df5e3eebe07e683782b264dadf65e7') + '1ede8951f4bebac3b50a8e0b999aa348') #_extramodules=extramodules-3.5-LIBRE #_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true @@ -139,13 +133,10 @@ build() { rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png ## Adding free distros icons - for i in {gnuhurd,dynebolic,venenux,{gnu{,linux},parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do + for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images" done - ## Removing non-free OS icons - rm -v "./src/VBox/Frontends/VirtualBox/images/os_"{{{arch,turbo}linux,debian,fedora,gentoo,linux{24,26},macosx,mandriva,{free,net,open}bsd,redhat,solaris,opensuse,oracle{,solaris},ubuntu,win{2k{3,8},7,8,vista,xp},xandros}{,_64},dos,jrockitve,l4,linux{,22,_other},netware,qnx,os2{_other,ecs,warp{3,4,45}},win{2k,31,95,98,_other,me,nt4}}.png - cp "$srcdir/LocalConfig.kmk" . # fake makeself binary to compile without nofatal @@ -168,7 +159,7 @@ build() { } package_virtualbox-libre() { - pkgdesc='Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)' + pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)' depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index e6c05d8f4..223aeeb16 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,425 +1,6 @@ ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-09-19 01:30:56.328334913 -0300 -@@ -44,99 +44,111 @@ - - static const osTypePattern gs_OSTypePattern[] = - { -- /* DOS: */ -- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, -+ -+ /* Code names for GNU/Linux distributions */ -+ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, -+ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, -+ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" }, -+ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" }, -+ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" }, -+ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" }, -+ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "GNULinux" }, -+ -+ /* Regular names of GNU/Linux distributions and GNU-Hurd */ -+ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" }, -+ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" }, -+ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" }, -+ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" }, -+ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" }, -+ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" }, -+ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" }, -+ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" }, -+ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" }, -+ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" }, -+ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" }, -+ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" }, -+ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" }, -+ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, -+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, -+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, -+ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, -+ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" }, -+ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Arc.*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("Arc", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Deb.*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("Deb", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Fe.*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("Fe", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Tur.*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("Tur", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Ub.*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("Ub", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Xa.*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("Xa", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Knoppix", Qt::CaseInsensitive), "GNULinux" }, -+ { QRegExp("Dsl", Qt::CaseInsensitive), "GNULinux" }, - -- /* Windows: */ -- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, -- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, -- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, -- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" }, -- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" }, -- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" }, -- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" }, -- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, -- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, -- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, -- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, -- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, -- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, -- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" }, -- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" }, -- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" }, -- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, -- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, -- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, -- -- /* Solaris: */ -- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, -- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, -- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, -- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, -- { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, -- -- /* OS/2: */ -- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, -- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, -- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, -- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, -- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, -- -- /* Code names for Linux distributions: */ -- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, -- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, -- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -- { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "Debian" }, -- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, -- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, -- -- /* Regular names of Linux distributions: */ -- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, -- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, -- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -- { QRegExp("Deb", Qt::CaseInsensitive), "Debian" }, -- { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" }, -- { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" }, -- { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" }, -- { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" }, -- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, -- { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" }, -- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, -- { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" }, -- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, -- { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" }, -- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, -- { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" }, -- { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" }, -- { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" }, -- { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" }, -- { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" }, -- { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" }, -- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, -- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, -- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, -- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, -- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, -- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, -- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, -- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, -- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, -- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, -- -- /* Other: */ -- { QRegExp("L4", Qt::CaseInsensitive), "L4" }, -- { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, -- { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, -- { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "OpenBSD_64" }, -- { QRegExp("Op.*B", Qt::CaseInsensitive), "OpenBSD" }, -- { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "NetBSD_64" }, -- { QRegExp("Ne.*B", Qt::CaseInsensitive), "NetBSD" }, -- { QRegExp("QN", Qt::CaseInsensitive), "QNX" }, -- { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "MacOS_64" }, -- { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, -- { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, -- { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, -+ /* Other */ - { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("DOS", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Wi", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("So.*11", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("So.*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("So", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("L4", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Op.*B", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Ne.*B", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("QN", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Net", Qt::CaseInsensitive), "Other" }, -+ { QRegExp("Rocki", Qt::CaseInsensitive), "Other" }, - }; - - UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup) ---- VirtualBox-4.1.18.orig/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.498764160 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.548761649 -0300 -@@ -3227,40 +3227,18 @@ - } aConvertOSTypes[] = - { - { "unknown", "Other" }, -- { "dos", "DOS" }, -- { "win31", "Windows31" }, -- { "win95", "Windows95" }, -- { "win98", "Windows98" }, -- { "winme", "WindowsMe" }, -- { "winnt4", "WindowsNT4" }, -- { "win2k", "Windows2000" }, -- { "winxp", "WindowsXP" }, -- { "win2k3", "Windows2003" }, -- { "winvista", "WindowsVista" }, -- { "win2k8", "Windows2008" }, -- { "os2warp3", "OS2Warp3" }, -- { "os2warp4", "OS2Warp4" }, -- { "os2warp45", "OS2Warp45" }, -- { "ecs", "OS2eCS" }, -- { "linux22", "Linux22" }, -- { "linux24", "Linux24" }, -- { "linux26", "Linux26" }, -- { "archlinux", "ArchLinux" }, -- { "debian", "Debian" }, -- { "opensuse", "OpenSUSE" }, -- { "fedoracore", "Fedora" }, -- { "gentoo", "Gentoo" }, -- { "mandriva", "Mandriva" }, -- { "redhat", "RedHat" }, -- { "ubuntu", "Ubuntu" }, -- { "xandros", "Xandros" }, -- { "freebsd", "FreeBSD" }, -- { "openbsd", "OpenBSD" }, -- { "netbsd", "NetBSD" }, -- { "netware", "Netware" }, -- { "solaris", "Solaris" }, -- { "opensolaris", "OpenSolaris" }, -- { "l4", "L4" } -+ { "gnu", "GNU" }, -+ { "gnuhurd", "GNUHurd" }, -+ { "gnulinux", "GNULinux" }, -+ { "parabola", "Parabola" }, -+ { "gnewsense", "gNewSense" }, -+ { "blag", "Blag" }, -+ { "dragora", "Dragora" }, -+ { "ututo", "Ututo" }, -+ { "musix", "Musix" }, -+ { "trisquel", "Trisquel" }, -+ { "dynebolic", "Dynebolic" }, -+ { "venenux", "Venenux" }, - }; - - void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str) ---- VirtualBox-4.1.18.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-07-25 15:21:04.553581275 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/xml/SettingsConverter.xsl 2012-07-25 15:21:04.593579427 -0300 -@@ -729,40 +729,18 @@ - <xsl:attribute name="OSType"> - <xsl:choose> - <xsl:when test="@OSType='unknown'">Other</xsl:when> -- <xsl:when test="@OSType='dos'">DOS</xsl:when> -- <xsl:when test="@OSType='win31'">Windows31</xsl:when> -- <xsl:when test="@OSType='win95'">Windows95</xsl:when> -- <xsl:when test="@OSType='win98'">Windows98</xsl:when> -- <xsl:when test="@OSType='winme'">WindowsMe</xsl:when> -- <xsl:when test="@OSType='winnt4'">WindowsNT4</xsl:when> -- <xsl:when test="@OSType='win2k'">Windows2000</xsl:when> -- <xsl:when test="@OSType='winxp'">WindowsXP</xsl:when> -- <xsl:when test="@OSType='win2k3'">Windows2003</xsl:when> -- <xsl:when test="@OSType='winvista'">WindowsVista</xsl:when> -- <xsl:when test="@OSType='win2k8'">Windows2008</xsl:when> -- <xsl:when test="@OSType='os2warp3'">OS2Warp3</xsl:when> -- <xsl:when test="@OSType='os2warp4'">OS2Warp4</xsl:when> -- <xsl:when test="@OSType='os2warp45'">OS2Warp45</xsl:when> -- <xsl:when test="@OSType='ecs'">OS2eCS</xsl:when> -- <xsl:when test="@OSType='linux22'">Linux22</xsl:when> -- <xsl:when test="@OSType='linux24'">Linux24</xsl:when> -- <xsl:when test="@OSType='linux26'">Linux26</xsl:when> -- <xsl:when test="@OSType='archlinux'">ArchLinux</xsl:when> -- <xsl:when test="@OSType='debian'">Debian</xsl:when> -- <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when> -- <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when> -- <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when> -- <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when> -- <xsl:when test="@OSType='redhat'">RedHat</xsl:when> -- <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when> -- <xsl:when test="@OSType='xandros'">Xandros</xsl:when> -- <xsl:when test="@OSType='freebsd'">FreeBSD</xsl:when> -- <xsl:when test="@OSType='openbsd'">OpenBSD</xsl:when> -- <xsl:when test="@OSType='netbsd'">NetBSD</xsl:when> -- <xsl:when test="@OSType='netware'">Netware</xsl:when> -- <xsl:when test="@OSType='solaris'">Solaris</xsl:when> -- <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when> -- <xsl:when test="@OSType='l4'">L4</xsl:when> -+ <xsl:when test="@OSType='gnu'">GNU</xsl:when> -+ <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when> -+ <xsl:when test="@OSType='gnulinux'">GNULinux</xsl:when> -+ <xsl:when test="@OSType='parabola'">Parabola</xsl:when> -+ <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when> -+ <xsl:when test="@OSType='blag'">Blag</xsl:when> -+ <xsl:when test="@OSType='dragora'">Dragora</xsl:when> -+ <xsl:when test="@OSType='ututo'">Ututo</xsl:when> -+ <xsl:when test="@OSType='musix'">Musix</xsl:when> -+ <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when> -+ <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when> -+ <xsl:when test="@OSType='venenux'">Venenux</xsl:when> - </xsl:choose> - </xsl:attribute> - <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> ---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:52:44.572133271 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:58:47.789130085 -0300 -@@ -1,75 +1,27 @@ - <RCC> - <qresource prefix="/"> -- <file alias="os_archlinux.png">images/os_archlinux.png</file> -- <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file> -- <file alias="os_debian.png">images/os_debian.png</file> -- <file alias="os_debian_64.png">images/os_debian_64.png</file> -- <file alias="os_dos.png">images/os_dos.png</file> -- <file alias="os_fedora.png">images/os_fedora.png</file> -- <file alias="os_fedora_64.png">images/os_fedora_64.png</file> -- <file alias="os_freebsd.png">images/os_freebsd.png</file> -- <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file> -- <file alias="os_gentoo.png">images/os_gentoo.png</file> -- <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file> -- <file alias="os_jrockitve.png">images/os_jrockitve.png</file> -- <file alias="os_l4.png">images/os_l4.png</file> -- <file alias="os_linux_other.png">images/os_linux_other.png</file> -- <file alias="os_linux22.png">images/os_linux22.png</file> -- <file alias="os_linux24.png">images/os_linux24.png</file> -- <file alias="os_linux24_64.png">images/os_linux24_64.png</file> -- <file alias="os_linux26.png">images/os_linux26.png</file> -- <file alias="os_linux26_64.png">images/os_linux26_64.png</file> -- <file alias="os_mandriva.png">images/os_mandriva.png</file> -- <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> -- <file alias="os_netbsd.png">images/os_netbsd.png</file> -- <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file> -- <file alias="os_netware.png">images/os_netware.png</file> -- <file alias="os_openbsd.png">images/os_openbsd.png</file> -- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file> -- <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file> -- <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file> -- <file alias="os_opensuse.png">images/os_opensuse.png</file> -- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file> -- <file alias="os_os2_other.png">images/os_os2_other.png</file> -- <file alias="os_os2ecs.png">images/os_os2ecs.png</file> -- <file alias="os_os2warp3.png">images/os_os2warp3.png</file> -- <file alias="os_os2warp4.png">images/os_os2warp4.png</file> -- <file alias="os_os2warp45.png">images/os_os2warp45.png</file> - <file alias="os_other.png">images/os_other.png</file> -- <file alias="os_qnx.png">images/os_qnx.png</file> -- <file alias="os_redhat.png">images/os_redhat.png</file> -- <file alias="os_redhat_64.png">images/os_redhat_64.png</file> -- <file alias="os_turbolinux.png">images/os_turbolinux.png</file> -- <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file> -- <file alias="os_solaris.png">images/os_solaris.png</file> -- <file alias="os_solaris_64.png">images/os_solaris_64.png</file> -- <file alias="os_ubuntu.png">images/os_ubuntu.png</file> -- <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file> -- <file alias="os_win_other.png">images/os_win_other.png</file> -- <file alias="os_win2k.png">images/os_win2k.png</file> -- <file alias="os_win2k3.png">images/os_win2k3.png</file> -- <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file> -- <file alias="os_win2k8.png">images/os_win2k8.png</file> -- <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file> -- <file alias="os_win31.png">images/os_win31.png</file> -- <file alias="os_win7.png">images/os_win7.png</file> -- <file alias="os_win7_64.png">images/os_win7_64.png</file> -- <file alias="os_win8.png">images/os_win8.png</file> -- <file alias="os_win8_64.png">images/os_win8_64.png</file> -- <file alias="os_win95.png">images/os_win95.png</file> -- <file alias="os_win98.png">images/os_win98.png</file> -- <file alias="os_winme.png">images/os_winme.png</file> -- <file alias="os_winnt4.png">images/os_winnt4.png</file> -- <file alias="os_winvista.png">images/os_winvista.png</file> -- <file alias="os_winvista_64.png">images/os_winvista_64.png</file> -- <file alias="os_winxp.png">images/os_winxp.png</file> -- <file alias="os_winxp_64.png">images/os_winxp_64.png</file> -- <file alias="os_xandros.png">images/os_xandros.png</file> -- <file alias="os_xandros_64.png">images/os_xandros_64.png</file> -- <file alias="os_oracle.png">images/os_oracle.png</file> -- <file alias="os_oracle_64.png">images/os_oracle_64.png</file> -- <file alias="os_macosx.png">images/os_macosx.png</file> -- <file alias="os_macosx_64.png">images/os_macosx_64.png</file> -+ <file alias="os_parabola.png">images/os_parabola.png</file> -+ <file alias="os_parabola_64.png">images/os_parabola_64.png</file> -+ <file alias="os_gnewsense.png">images/os_gnewsense.png</file> -+ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file> -+ <file alias="os_blag.png">images/os_blag.png</file> -+ <file alias="os_blag_64.png">images/os_blag_64.png</file> -+ <file alias="os_ututo.png">images/os_ututo.png</file> -+ <file alias="os_ututo_64.png">images/os_ututo_64.png</file> -+ <file alias="os_gnu.png">images/os_gnu.png</file> -+ <file alias="os_gnu_64.png">images/os_gnu_64.png</file> -+ <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file> -+ <file alias="os_gnulinux.png">images/os_gnulinux.png</file> -+ <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file> -+ <file alias="os_musix.png">images/os_musix.png</file> -+ <file alias="os_musix_64.png">images/os_musix_64.png</file> -+ <file alias="os_dragora.png">images/os_dragora.png</file> -+ <file alias="os_dragora_64.png">images/os_dragora_64.png</file> -+ <file alias="os_dynebolic.png">images/os_dynebolic.png</file> -+ <file alias="os_venenux.png">images/os_venenux.png</file> -+ <file alias="os_trisquel.png">images/os_trisquel.png</file> -+ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file> - <file alias="hd_16px.png">images/hd_16px.png</file> - <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> - <file alias="hd_32px.png">images/hd_32px.png</file> --- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-09-19 03:33:50.143066084 -0300 -@@ -29,296 +29,94 @@ - /* NOTE1: we assume that unknown is always the first entry! - * NOTE2: please use powers of 2 when specifying the size of harddisks since - * '2GB' looks better than '1.95GB' (= 2000MB) */ -- { "Other", "Other", "Other", "Other/Unknown", -+ { "Other", "Other", "Other", "Other/Unknown", ++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-03 15:38:41.975881316 -0300 +@@ -33,289 +33,365 @@ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, @@ -504,16 +85,6 @@ - 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux22", "Linux 2.2", -- VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC, -- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", "Linux24", "Linux 2.4", -- VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC, -- 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64 bit)", -- VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + { "GNU", "GNU", "GNU", "GNU", + VBOXOSTYPE_GNU, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -525,326 +96,664 @@ + { "GNU-Hurd", "GNU-Hurd", "GNUHurd", "GNU-Hurd", + VBOXOSTYPE_GNUHurd, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "GNU/Linux", "GNU/Linux", "Linux22", "GNU/Linux with kernel v2.2", + VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", "Linux24", "Linux 2.4", ++ { "GNU/Linux", "GNU/Linux", "Linux24", "GNU/Linux with kernel v2.4", + VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC, + 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Linux24_64", "GNU/Linux with kernel v2.4 (64 bit)", + VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, + 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux26", "Linux 2.6", -- VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "GNULinux", "GNU/Linux", -+ VBOXOSTYPE_GNULinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "GNU/Linux", "GNU/Linux", "Linux26", "GNU/Linux with kernel v2.6", + VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux26_64", "Linux 2.6 (64 bit)", -- VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "GNULinux_64", "GNU/Linux (64 bit)", -+ VBOXOSTYPE_GNULinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "GNU/Linux", "GNU/Linux", "Linux26_64", "GNU/Linux with kernel v2.6 (64 bit)", + VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "ArchLinux", "Arch Linux", -- VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Parabola", "Parabola GNU/Linux-libre", ++ { "GNU/Linux", "GNU/Linux", "Linux", "Other GNU/Linux", ++ VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Parabola", "Parabola GNU/Linux-libre", + VBOXOSTYPE_Parabola, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Parabola_64", "Parabola GNU/Linux-libre (64 bit)", ++ VBOXOSTYPE_Parabola_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "gNewSense", "gNewSense", ++ VBOXOSTYPE_gNewSense, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "gNewSense_64", "gNewSense (64 bit)", ++ VBOXOSTYPE_gNewSense_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, ++ { "Free Distros", "Free GNU/Linux Distros", "Blag", "Blag Linux and GNU", ++ VBOXOSTYPE_Blag, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Blag_64", "Blag Linux and GNU (64 bit)", ++ VBOXOSTYPE_Blag_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Dragora", "Dragora", ++ VBOXOSTYPE_Dragora, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Dragora_64", "Dragora (64 bit)", ++ VBOXOSTYPE_Dragora_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Ututo", "Ututo XS", ++ VBOXOSTYPE_Ututo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Ututo_64", "Ututo XS (64 bit)", ++ VBOXOSTYPE_Ututo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Musix", "Musix", ++ VBOXOSTYPE_Musix, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Musix_64", "Musix (64 bit)", ++ VBOXOSTYPE_Musix_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, ++ { "Free Distros", "Free GNU/Linux Distros", "Trisquel", "Trisquel", ++ VBOXOSTYPE_Trisquel, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, ++ 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Trisquel_64", "Trisquel (64 bit)", ++ VBOXOSTYPE_Trisquel_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Dynebolic", "Dyne:bolic", ++ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Free Distros", "Free GNU/Linux Distros", "Venenux", "Venenux", ++ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux", + VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)", -- VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Parabola_64", "Parabola GNU/Linux-libre (64 bit)", -+ VBOXOSTYPE_Parabola_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux_64", "Arch Linux (64 bit)", + VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian", "Debian", -- VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "gNewSense", "gNewSense", -+ VBOXOSTYPE_gNewSense, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian", "Debian", + VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian_64", "Debian (64 bit)", -- VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "gNewSense_64", "gNewSense (64 bit)", -+ VBOXOSTYPE_gNewSense_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian_64", "Debian (64 bit)", + VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, - { "Linux", "Linux", "OpenSUSE", "openSUSE", -- VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE", "openSUSE", + VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)", -- VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE_64", "openSUSE (64 bit)", + VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora", "Fedora", -- VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Blag", "Blag Linux and GNU", -+ VBOXOSTYPE_Blag, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora", "Fedora", + VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)", -- VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Blag_64", "Blag Linux and GNU (64 bit)", -+ VBOXOSTYPE_Blag_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora_64", "Fedora (64 bit)", + VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo", "Gentoo", -- VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Dragora", "Dragora", -+ VBOXOSTYPE_Dragora, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo", "Gentoo", + VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)", -- VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Dragora_64", "Dragora (64 bit)", -+ VBOXOSTYPE_Dragora_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo_64", "Gentoo (64 bit)", + VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva", "Mandriva", -- VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva", "Mandriva", + VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)", -- VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva_64", "Mandriva (64 bit)", + VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat", "Red Hat", -- VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", "Ututo", "Ututo XS", -+ VBOXOSTYPE_Ututo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat", "Red Hat", + VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, + 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)", -- VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", "Ututo_64", "Ututo XS (64 bit)", -+ VBOXOSTYPE_Ututo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat_64", "Red Hat (64 bit)", + VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, + 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux", "Turbolinux", -- VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Musix", "Musix", -+ VBOXOSTYPE_Musix, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux", "Turbolinux", + VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)", -- VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Musix_64", "Musix (64 bit)", -+ VBOXOSTYPE_Musix_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux_64", "Turbolinux (64 bit)", + VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu", "Ubuntu", -- VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, -+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, -+ { "GNU/Linux", "GNU/Linux", "Trisquel", "Trisquel", -+ VBOXOSTYPE_Trisquel, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu", "Ubuntu", + VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)", -- VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", "Trisquel_64", "Trisquel (64 bit)", -+ VBOXOSTYPE_Trisquel_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu_64", "Ubuntu (64 bit)", + VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros", "Xandros", -- VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, -- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", "Dynebolic", "Dyne:bolic", -+ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros", "Xandros", + VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)", -- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", "Venenux", "Venenux", -+ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros_64", "Xandros (64 bit)", + VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle", "Oracle", -- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, -- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle", "Oracle", + VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, + 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", -- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle_64", "Oracle (64 bit)", + VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, + 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1", ++ VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, ++ 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows95", "Windows 95", ++ VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, ++ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows98", "Windows 98", ++ VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, ++ 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsMe", "Windows ME", ++ VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, ++ 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4", "Windows NT 4", ++ VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, ++ 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2000", "Windows 2000", ++ VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, ++ 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP", "Windows XP", ++ VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, ++ 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64", "Windows XP (64 bit)", ++ VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003", "Windows 2003", ++ VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, ++ 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64", "Windows 2003 (64 bit)", ++ VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista", "Windows Vista", ++ VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, ++ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64", "Windows Vista (64 bit)", ++ VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008", "Windows 2008", ++ VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, ++ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64", "Windows 2008 (64 bit)", ++ VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7", "Windows 7", ++ VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, ++ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows7_64", "Windows 7 (64 bit)", ++ VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8", "Windows 8", ++ VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, ++ 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows8_64", "Windows 8 (64 bit)", ++ VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)", ++ VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, ++ 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, ++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT", "Other Windows", ++ VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, ++ 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier", -- VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, -- 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris", "Oracle Solaris 10 5/09 and earlier", + VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, + 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", -- VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, -- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", + VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, + 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later", -- VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, -- 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris", "Oracle Solaris 10 10/09 and later", + VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, + 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", -- VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, -- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", + VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", -- VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, -- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, -- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Solaris11_64", "Oracle Solaris 11 (64 bit)", + VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD", "FreeBSD", -- VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, -- 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", + VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, + 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", -- VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, -- 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", + VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, + 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD", "OpenBSD", -- VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, -- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", + VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, + 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", -- VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, -- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", + VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, + 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD", "NetBSD", -- VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, -- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", + VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, + 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", -- VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, -- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", + VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, + 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", -- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, -- 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", + VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, + 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", -- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, -- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", + VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", -- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, -- 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", + VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, + 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", -- VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, -- 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", + VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, + 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", -- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, -- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", + VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, + 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", -- VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, -- 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, -- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, -- ChipsetType_ICH9, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", + VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, + 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, + StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, + ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", -- VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, -- 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, -- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, -- ChipsetType_ICH9, AudioControllerType_HDA }, ++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", + VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, + 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, + StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, + ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", -- VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, -- 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, ++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", + VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, + 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "Netware", "Netware", -- VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, -- 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", + VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, + 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "L4", "L4", -- VBOXOSTYPE_L4, VBOXOSHINT_NONE, -- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", + VBOXOSTYPE_L4, VBOXOSHINT_NONE, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "QNX", "QNX", -- VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, -- 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", + VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, + 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "JRockitVE", "JRockitVE", -- VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, -- 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, ++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", + VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, + 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-04 01:54:14.693582889 -0300 +@@ -44,45 +44,45 @@ + + static const osTypePattern gs_OSTypePattern[] = + { +- /* DOS: */ +- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, +- +- /* Windows: */ +- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, +- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, +- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, +- { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" }, +- { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" }, +- { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" }, +- { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" }, +- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, +- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, +- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, +- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, +- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, +- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, +- { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" }, +- { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" }, +- { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" }, +- { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, +- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, +- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, +- +- /* Solaris: */ +- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, +- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, +- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, +- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, +- { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, +- +- /* OS/2: */ +- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, +- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, +- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, +- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, +- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, ++ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, ++ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, ++ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, ++ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" }, ++ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" }, ++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, ++ ++ /* Code names for free GNU/Linux distributions */ ++ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, ++ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, ++ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" }, ++ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" }, ++ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" }, ++ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" }, ++ ++ /* Regular names of free GNU/Linux distributions */ ++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" }, ++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" }, ++ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" }, ++ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" }, ++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" }, ++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" }, ++ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" }, ++ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" }, ++ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" }, ++ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" }, ++ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" }, ++ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" }, ++ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" }, ++ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, ++ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, ++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, + +- /* Code names for Linux distributions: */ ++ /* Code names for non-free GNU/Linux distributions: */ + { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, + { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, + { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, +@@ -90,7 +90,7 @@ + { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, + { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, + +- /* Regular names of Linux distributions: */ ++ /* Regular names of non-free GNU/Linux distributions: */ + { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, + { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, + { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, +@@ -115,15 +115,38 @@ + { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, + { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, + { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, +- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, +- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, +- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, +- { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, +- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, +- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, +- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, + +- /* Other: */ ++ /* Regular names of non-free operating systems: */ ++ { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, ++ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, ++ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, ++ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, ++ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" }, ++ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" }, ++ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" }, ++ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" }, ++ { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" }, ++ { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" }, ++ { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" }, ++ { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" }, ++ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" }, ++ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" }, ++ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" }, ++ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" }, ++ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" }, ++ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" }, ++ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, ++ { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, ++ { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, ++ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, ++ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, ++ { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, ++ { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, ++ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, ++ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, ++ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, ++ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, ++ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, + { QRegExp("L4", Qt::CaseInsensitive), "L4" }, + { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, + { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, +@@ -136,6 +159,8 @@ + { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, + { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, + { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, ++ ++ /* Other: */ + { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, + }; + +--- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp 2012-08-29 11:13:34.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp 2012-10-03 17:02:44.581501053 -0300 +@@ -3405,7 +3405,18 @@ + { "netware", "Netware" }, + { "solaris", "Solaris" }, + { "opensolaris", "OpenSolaris" }, +- { "l4", "L4" } ++ { "l4", "L4" }, ++ { "gnu", "GNU" }, ++ { "gnuhurd", "GNUHurd" }, ++ { "parabola", "Parabola" }, ++ { "gnewsense", "gNewSense" }, ++ { "blag", "Blag" }, ++ { "dragora", "Dragora" }, ++ { "ututo", "Ututo" }, ++ { "musix", "Musix" }, ++ { "trisquel", "Trisquel" }, ++ { "dynebolic", "Dynebolic" }, ++ { "venenux", "Venenux" } }; - uint32_t Global::cOSTypes = RT_ELEMENTS(Global::sOSTypes); + void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str) +--- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl 2012-09-04 09:48:43.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl 2012-10-03 17:02:10.780019131 -0300 +@@ -763,6 +763,17 @@ + <xsl:when test="@OSType='solaris'">Solaris</xsl:when> + <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when> + <xsl:when test="@OSType='l4'">L4</xsl:when> ++ <xsl:when test="@OSType='gnu'">GNU</xsl:when> ++ <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when> ++ <xsl:when test="@OSType='parabola'">Parabola</xsl:when> ++ <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when> ++ <xsl:when test="@OSType='blag'">Blag</xsl:when> ++ <xsl:when test="@OSType='dragora'">Dragora</xsl:when> ++ <xsl:when test="@OSType='ututo'">Ututo</xsl:when> ++ <xsl:when test="@OSType='musix'">Musix</xsl:when> ++ <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when> ++ <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when> ++ <xsl:when test="@OSType='venenux'">Venenux</xsl:when> + </xsl:choose> + </xsl:attribute> + <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-10-03 00:13:20.408089706 -0300 +@@ -70,6 +70,24 @@ + <file alias="os_oracle_64.png">images/os_oracle_64.png</file> + <file alias="os_macosx.png">images/os_macosx.png</file> + <file alias="os_macosx_64.png">images/os_macosx_64.png</file> ++ <file alias="os_parabola.png">images/os_parabola.png</file> ++ <file alias="os_parabola_64.png">images/os_parabola_64.png</file> ++ <file alias="os_gnewsense.png">images/os_gnewsense.png</file> ++ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file> ++ <file alias="os_blag.png">images/os_blag.png</file> ++ <file alias="os_blag_64.png">images/os_blag_64.png</file> ++ <file alias="os_ututo.png">images/os_ututo.png</file> ++ <file alias="os_ututo_64.png">images/os_ututo_64.png</file> ++ <file alias="os_gnu.png">images/os_gnu.png</file> ++ <file alias="os_gnu_64.png">images/os_gnu_64.png</file> ++ <file alias="os_musix.png">images/os_musix.png</file> ++ <file alias="os_musix_64.png">images/os_musix_64.png</file> ++ <file alias="os_dragora.png">images/os_dragora.png</file> ++ <file alias="os_dragora_64.png">images/os_dragora_64.png</file> ++ <file alias="os_dynebolic.png">images/os_dynebolic.png</file> ++ <file alias="os_venenux.png">images/os_venenux.png</file> ++ <file alias="os_trisquel.png">images/os_trisquel.png</file> ++ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file> + <file alias="hd_16px.png">images/hd_16px.png</file> + <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> + <file alias="hd_32px.png">images/hd_32px.png</file> --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-19 02:10:41.293426675 -0300 -@@ -4283,76 +4283,27 @@ - static const char *kOSTypeIcons [][2] = - { - {"Other", ":/os_other.png"}, -- {"DOS", ":/os_dos.png"}, -- {"Netware", ":/os_netware.png"}, -- {"L4", ":/os_l4.png"}, -- {"Windows31", ":/os_win31.png"}, -- {"Windows95", ":/os_win95.png"}, -- {"Windows98", ":/os_win98.png"}, -- {"WindowsMe", ":/os_winme.png"}, -- {"WindowsNT4", ":/os_winnt4.png"}, -- {"Windows2000", ":/os_win2k.png"}, -- {"WindowsXP", ":/os_winxp.png"}, -- {"WindowsXP_64", ":/os_winxp_64.png"}, -- {"Windows2003", ":/os_win2k3.png"}, -- {"Windows2003_64", ":/os_win2k3_64.png"}, -- {"WindowsVista", ":/os_winvista.png"}, -- {"WindowsVista_64", ":/os_winvista_64.png"}, -- {"Windows2008", ":/os_win2k8.png"}, -- {"Windows2008_64", ":/os_win2k8_64.png"}, -- {"Windows7", ":/os_win7.png"}, -- {"Windows7_64", ":/os_win7_64.png"}, -- {"Windows8", ":/os_win8.png"}, -- {"Windows8_64", ":/os_win8_64.png"}, -- {"WindowsNT", ":/os_win_other.png"}, -- {"OS2Warp3", ":/os_os2warp3.png"}, -- {"OS2Warp4", ":/os_os2warp4.png"}, -- {"OS2Warp45", ":/os_os2warp45.png"}, -- {"OS2eCS", ":/os_os2ecs.png"}, -- {"OS2", ":/os_os2_other.png"}, ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-10-03 17:03:46.114796857 -0300 +@@ -4310,11 +4310,11 @@ + {"OS2Warp45", ":/os_os2warp45.png"}, + {"OS2eCS", ":/os_os2ecs.png"}, + {"OS2", ":/os_os2_other.png"}, - {"Linux22", ":/os_linux22.png"}, - {"Linux24", ":/os_linux24.png"}, - {"Linux24_64", ":/os_linux24_64.png"}, - {"Linux26", ":/os_linux26.png"}, - {"Linux26_64", ":/os_linux26_64.png"}, -- {"ArchLinux", ":/os_archlinux.png"}, -- {"ArchLinux_64", ":/os_archlinux_64.png"}, -- {"Debian", ":/os_debian.png"}, -- {"Debian_64", ":/os_debian_64.png"}, -- {"OpenSUSE", ":/os_opensuse.png"}, -- {"OpenSUSE_64", ":/os_opensuse_64.png"}, -- {"Fedora", ":/os_fedora.png"}, -- {"Fedora_64", ":/os_fedora_64.png"}, -- {"Gentoo", ":/os_gentoo.png"}, -- {"Gentoo_64", ":/os_gentoo_64.png"}, -- {"Mandriva", ":/os_mandriva.png"}, -- {"Mandriva_64", ":/os_mandriva_64.png"}, -- {"RedHat", ":/os_redhat.png"}, -- {"RedHat_64", ":/os_redhat_64.png"}, -- {"Turbolinux", ":/os_turbolinux.png"}, -- {"Turbolinux_64", ":/os_turbolinux_64.png"}, -- {"Ubuntu", ":/os_ubuntu.png"}, -- {"Ubuntu_64", ":/os_ubuntu_64.png"}, -- {"Xandros", ":/os_xandros.png"}, -- {"Xandros_64", ":/os_xandros_64.png"}, -- {"Oracle", ":/os_oracle.png"}, -- {"Oracle_64", ":/os_oracle_64.png"}, ++ {"Linux22", ":/os_gnu.png"}, ++ {"Linux24", ":/os_gnu.png"}, ++ {"Linux24_64", ":/os_gnu_64.png"}, ++ {"Linux26", ":/os_gnu.png"}, ++ {"Linux26_64", ":/os_gnu_64.png"}, + {"ArchLinux", ":/os_archlinux.png"}, + {"ArchLinux_64", ":/os_archlinux_64.png"}, + {"Debian", ":/os_debian.png"}, +@@ -4337,7 +4337,7 @@ + {"Xandros_64", ":/os_xandros_64.png"}, + {"Oracle", ":/os_oracle.png"}, + {"Oracle_64", ":/os_oracle_64.png"}, - {"Linux", ":/os_linux_other.png"}, -- {"FreeBSD", ":/os_freebsd.png"}, -- {"FreeBSD_64", ":/os_freebsd_64.png"}, -- {"OpenBSD", ":/os_openbsd.png"}, -- {"OpenBSD_64", ":/os_openbsd_64.png"}, -- {"NetBSD", ":/os_netbsd.png"}, -- {"NetBSD_64", ":/os_netbsd_64.png"}, -- {"Solaris", ":/os_solaris.png"}, -- {"Solaris_64", ":/os_solaris_64.png"}, -- {"OpenSolaris", ":/os_oraclesolaris.png"}, -- {"OpenSolaris_64", ":/os_oraclesolaris_64.png"}, -- {"Solaris11_64", ":/os_oraclesolaris_64.png"}, -- {"QNX", ":/os_qnx.png"}, -- {"MacOS", ":/os_macosx.png"}, -- {"MacOS_64", ":/os_macosx_64.png"}, -- {"JRockitVE", ":/os_jrockitve.png"}, ++ {"Linux", ":/os_gnu.png"}, + {"FreeBSD", ":/os_freebsd.png"}, + {"FreeBSD_64", ":/os_freebsd_64.png"}, + {"OpenBSD", ":/os_openbsd.png"}, +@@ -4353,6 +4353,25 @@ + {"MacOS", ":/os_macosx.png"}, + {"MacOS_64", ":/os_macosx_64.png"}, + {"JRockitVE", ":/os_jrockitve.png"}, + {"GNU", ":/os_gnu.png"}, + {"GNU_64", ":/os_gnu_64.png"}, -+ {"GNUHurd", ":/os_gnuhurd.png"}, -+ {"GNULinux", ":/os_gnulinux.png"}, -+ {"GNULinux_64", ":/os_gnulinux_64.png"}, ++ {"GNUHurd", ":/os_gnu.png"}, + {"Parabola", ":/os_parabola.png"}, + {"Parabola_64", ":/os_parabola_64.png"}, + {"gNewSense", ":/os_gnewsense.png"}, @@ -865,233 +774,46 @@ for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n) { --- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300 -+++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-09-19 02:20:24.640916587 -0300 -@@ -43,79 +43,27 @@ - typedef enum VBOXOSTYPE - { - VBOXOSTYPE_Unknown = 0, -- VBOXOSTYPE_DOS = 0x10000, -- VBOXOSTYPE_Win31 = 0x15000, -- VBOXOSTYPE_Win9x = 0x20000, -- VBOXOSTYPE_Win95 = 0x21000, -- VBOXOSTYPE_Win98 = 0x22000, -- VBOXOSTYPE_WinMe = 0x23000, -- VBOXOSTYPE_WinNT = 0x30000, -- VBOXOSTYPE_WinNT4 = 0x31000, -- VBOXOSTYPE_Win2k = 0x32000, -- VBOXOSTYPE_WinXP = 0x33000, -- VBOXOSTYPE_WinXP_x64 = 0x33100, -- VBOXOSTYPE_Win2k3 = 0x34000, -- VBOXOSTYPE_Win2k3_x64 = 0x34100, -- VBOXOSTYPE_WinVista = 0x35000, -- VBOXOSTYPE_WinVista_x64 = 0x35100, -- VBOXOSTYPE_Win2k8 = 0x36000, -- VBOXOSTYPE_Win2k8_x64 = 0x36100, -- VBOXOSTYPE_Win7 = 0x37000, -- VBOXOSTYPE_Win7_x64 = 0x37100, -- VBOXOSTYPE_Win8 = 0x38000, -- VBOXOSTYPE_Win8_x64 = 0x38100, -- VBOXOSTYPE_Win2k12_x64 = 0x39100, -- VBOXOSTYPE_OS2 = 0x40000, -- VBOXOSTYPE_OS2Warp3 = 0x41000, -- VBOXOSTYPE_OS2Warp4 = 0x42000, -- VBOXOSTYPE_OS2Warp45 = 0x43000, -- VBOXOSTYPE_ECS = 0x44000, -- VBOXOSTYPE_Linux = 0x50000, -- VBOXOSTYPE_Linux_x64 = 0x50100, -- VBOXOSTYPE_Linux22 = 0x51000, -- VBOXOSTYPE_Linux24 = 0x52000, -- VBOXOSTYPE_Linux24_x64 = 0x52100, -- VBOXOSTYPE_Linux26 = 0x53000, -- VBOXOSTYPE_Linux26_x64 = 0x53100, -- VBOXOSTYPE_ArchLinux = 0x54000, -- VBOXOSTYPE_ArchLinux_x64 = 0x54100, -- VBOXOSTYPE_Debian = 0x55000, -- VBOXOSTYPE_Debian_x64 = 0x55100, -- VBOXOSTYPE_OpenSUSE = 0x56000, -- VBOXOSTYPE_OpenSUSE_x64 = 0x56100, -- VBOXOSTYPE_FedoraCore = 0x57000, -- VBOXOSTYPE_FedoraCore_x64 = 0x57100, -- VBOXOSTYPE_Gentoo = 0x58000, -- VBOXOSTYPE_Gentoo_x64 = 0x58100, -- VBOXOSTYPE_Mandriva = 0x59000, -- VBOXOSTYPE_Mandriva_x64 = 0x59100, -- VBOXOSTYPE_RedHat = 0x5A000, -- VBOXOSTYPE_RedHat_x64 = 0x5A100, -- VBOXOSTYPE_Turbolinux = 0x5B000, -- VBOXOSTYPE_Turbolinux_x64 = 0x5B100, -- VBOXOSTYPE_Ubuntu = 0x5C000, -- VBOXOSTYPE_Ubuntu_x64 = 0x5C100, -- VBOXOSTYPE_Xandros = 0x5D000, -- VBOXOSTYPE_Xandros_x64 = 0x5D100, -- VBOXOSTYPE_Oracle = 0x5E000, -- VBOXOSTYPE_Oracle_x64 = 0x5E100, -- VBOXOSTYPE_FreeBSD = 0x60000, -- VBOXOSTYPE_FreeBSD_x64 = 0x60100, -- VBOXOSTYPE_OpenBSD = 0x61000, -- VBOXOSTYPE_OpenBSD_x64 = 0x61100, -- VBOXOSTYPE_NetBSD = 0x62000, -- VBOXOSTYPE_NetBSD_x64 = 0x62100, -- VBOXOSTYPE_Netware = 0x70000, -- VBOXOSTYPE_Solaris = 0x80000, -- VBOXOSTYPE_Solaris_x64 = 0x80100, -- VBOXOSTYPE_OpenSolaris = 0x81000, -- VBOXOSTYPE_OpenSolaris_x64 = 0x81100, -- VBOXOSTYPE_Solaris11_x64 = 0x82100, -- VBOXOSTYPE_L4 = 0x90000, -- VBOXOSTYPE_QNX = 0xA0000, -- VBOXOSTYPE_MacOS = 0xB0000, -- VBOXOSTYPE_MacOS_x64 = 0xB0100, -- VBOXOSTYPE_JRockitVE = 0xC0000, -+ VBOXOSTYPE_GNU = 0x10000, -+ VBOXOSTYPE_GNU_x64 = 0x10100, -+ VBOXOSTYPE_GNUHurd = 0x20000, -+ VBOXOSTYPE_GNULinux = 0x30000, -+ VBOXOSTYPE_GNULinux_x64 = 0x30100, -+ VBOXOSTYPE_Parabola = 0x31000, -+ VBOXOSTYPE_Parabola_x64 = 0x31100, -+ VBOXOSTYPE_gNewSense = 0x32000, -+ VBOXOSTYPE_gNewSense_x64 = 0x32100, -+ VBOXOSTYPE_Blag = 0x33000, -+ VBOXOSTYPE_Blag_x64 = 0x33100, -+ VBOXOSTYPE_Dragora = 0x34000, -+ VBOXOSTYPE_Dragora_x64 = 0x34100, -+ VBOXOSTYPE_Ututo = 0x35000, -+ VBOXOSTYPE_Ututo_x64 = 0x35100, -+ VBOXOSTYPE_Musix = 0x36000, -+ VBOXOSTYPE_Musix_x64 = 0x36100, -+ VBOXOSTYPE_Trisquel = 0x37000, -+ VBOXOSTYPE_Trisquel_x64 = 0x37100, -+ VBOXOSTYPE_Dynebolic = 0x38000, -+ VBOXOSTYPE_Venenux = 0x39000, ++++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-10-03 17:07:12.143504689 -0300 +@@ -116,6 +116,25 @@ + VBOXOSTYPE_MacOS = 0xB0000, + VBOXOSTYPE_MacOS_x64 = 0xB0100, + VBOXOSTYPE_JRockitVE = 0xC0000, ++ VBOXOSTYPE_GNU = 0xD0000, ++ VBOXOSTYPE_GNU_x64 = 0xD0100, ++ VBOXOSTYPE_GNUHurd = 0xE0000, ++ VBOXOSTYPE_Parabola = 0xF0000, ++ VBOXOSTYPE_Parabola_x64 = 0xF0100, ++ VBOXOSTYPE_gNewSense = 0xF1000, ++ VBOXOSTYPE_gNewSense_x64 = 0xF1100, ++ VBOXOSTYPE_Blag = 0xF2000, ++ VBOXOSTYPE_Blag_x64 = 0xF2100, ++ VBOXOSTYPE_Dragora = 0xF3000, ++ VBOXOSTYPE_Dragora_x64 = 0xF3100, ++ VBOXOSTYPE_Ututo = 0xF4000, ++ VBOXOSTYPE_Ututo_x64 = 0xF4100, ++ VBOXOSTYPE_Musix = 0xF5000, ++ VBOXOSTYPE_Musix_x64 = 0xF5100, ++ VBOXOSTYPE_Trisquel = 0xF6000, ++ VBOXOSTYPE_Trisquel_x64 = 0xF6100, ++ VBOXOSTYPE_Dynebolic = 0xF7000, ++ VBOXOSTYPE_Venenux = 0xF8000, /** The bit number which indicates 64-bit or 32-bit. */ #define VBOXOSTYPE_x64_BIT 8 /** The mask which indicates 64-bit. */ -@@ -131,16 +79,11 @@ - typedef enum VBOXOSFAMILY - { - VBOXOSFAMILY_Unknown = 0, -- VBOXOSFAMILY_Windows32 = 1, -- VBOXOSFAMILY_Windows64 = 2, -- VBOXOSFAMILY_Linux32 = 3, -- VBOXOSFAMILY_Linux64 = 4, -- VBOXOSFAMILY_FreeBSD32 = 5, -- VBOXOSFAMILY_FreeBSD64 = 6, -- VBOXOSFAMILY_Solaris32 = 7, -- VBOXOSFAMILY_Solaris64 = 8, -- VBOXOSFAMILY_MacOSX32 = 9, -- VBOXOSFAMILY_MacOSX64 = 10, -+ VBOXOSFAMILY_GNU32 = 1, -+ VBOXOSFAMILY_GNU64 = 2, -+ VBOXOSFAMILY_GNUHurd = 3, -+ VBOXOSFAMILY_GNULinux32 = 4, -+ VBOXOSFAMILY_GNULinux64 = 5, - /** The usual 32-bit hack. */ - VBOXOSFAMILY_32BIT_HACK = 0x7fffffff - } VBOXOSFAMILY; --- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-09-19 04:40:38.226412294 -0300 -@@ -50,94 +50,33 @@ - g_osTypes[] = - { - { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown }, -- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2 }, -- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp3 }, -- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp4 }, -- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp45 }, -- { ovf::CIMOSType_CIMOS_MSDOS, VBOXOSTYPE_DOS }, -- { ovf::CIMOSType_CIMOS_WIN3x, VBOXOSTYPE_Win31 }, -- { ovf::CIMOSType_CIMOS_WIN95, VBOXOSTYPE_Win95 }, -- { ovf::CIMOSType_CIMOS_WIN98, VBOXOSTYPE_Win98 }, -- { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT }, -- { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT4 }, -- { ovf::CIMOSType_CIMOS_NetWare, VBOXOSTYPE_Netware }, -- { ovf::CIMOSType_CIMOS_NovellOES, VBOXOSTYPE_Netware }, -- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_Solaris }, -- { ovf::CIMOSType_CIMOS_SunOS, VBOXOSTYPE_Solaris }, -- { ovf::CIMOSType_CIMOS_FreeBSD, VBOXOSTYPE_FreeBSD }, -- { ovf::CIMOSType_CIMOS_NetBSD, VBOXOSTYPE_NetBSD }, -- { ovf::CIMOSType_CIMOS_QNX, VBOXOSTYPE_QNX }, -- { ovf::CIMOSType_CIMOS_Windows2000, VBOXOSTYPE_Win2k }, -- { ovf::CIMOSType_CIMOS_WindowsMe, VBOXOSTYPE_WinMe }, -- { ovf::CIMOSType_CIMOS_OpenBSD, VBOXOSTYPE_OpenBSD }, -- { ovf::CIMOSType_CIMOS_WindowsXP, VBOXOSTYPE_WinXP }, -- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, VBOXOSTYPE_WinXP }, -- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, VBOXOSTYPE_WinXP }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, VBOXOSTYPE_Win2k3 }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, VBOXOSTYPE_Win2k3_x64 }, -- { ovf::CIMOSType_CIMOS_WindowsXP_64, VBOXOSTYPE_WinXP_x64 }, -- { ovf::CIMOSType_CIMOS_WindowsVista, VBOXOSTYPE_WinVista }, -- { ovf::CIMOSType_CIMOS_WindowsVista_64, VBOXOSTYPE_WinVista_x64 }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, VBOXOSTYPE_Win2k8 }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, VBOXOSTYPE_Win2k8_x64 }, -- { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_x64 }, -- { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, -- { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this -- ++++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-10-03 17:11:27.739487250 -0300 +@@ -84,7 +84,32 @@ + { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, + { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this + - // Linuxes -- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, -- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, -- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, -- { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE }, -- { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_OpenSUSE }, -- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, VBOXOSTYPE_OpenSUSE }, -- { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_x64 }, -- { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_OpenSUSE_x64 }, -- { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux }, -- { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux22 }, -- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux }, -- { ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux }, -- { ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 }, -- { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, -- { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, -- { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, -- { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 }, -- { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian }, -- { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 }, -- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, -- { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, -- -- // types that we have support for but CIM doesn't -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Xandros }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 }, -- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris }, -- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 }, -- -- // types added with CIM 2.25.0 follow: -- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above --// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM -- { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7 }, -- { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7_x64 }, // there is no CIM 64-bit type for this -- { ovf::CIMOSType_CIMOS_CentOS, VBOXOSTYPE_RedHat }, -- { ovf::CIMOSType_CIMOS_CentOS_64, VBOXOSTYPE_RedHat_x64 }, -- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, VBOXOSTYPE_Oracle }, -- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, VBOXOSTYPE_Oracle_x64 }, -- { ovf::CIMOSType_CIMOS_eComStation, VBOXOSTYPE_ECS } -- -- // there are no CIM types for these, so these turn to "other" on export: -- // VBOXOSTYPE_OpenBSD -- // VBOXOSTYPE_OpenBSD_x64 -- // VBOXOSTYPE_NetBSD -- // VBOXOSTYPE_NetBSD_x64 -+ -+ // Custom OS ++ // Custom GNU and GNU-Hurd OS + { ovf::CIMOSType_CIMOS_GNU, VBOXOSTYPE_GNU }, + { ovf::CIMOSType_CIMOS_GNU_64, VBOXOSTYPE_GNU_x64 }, + { ovf::CIMOSType_CIMOS_GNUHurd, VBOXOSTYPE_GNUHurd }, -+ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_GNULinux }, -+ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_GNULinux_x64 }, -+ -+ // GNU/Linux free distros ++ ++ // Free GNU/Linux distros + { ovf::CIMOSType_CIMOS_gNewSense, VBOXOSTYPE_gNewSense }, + { ovf::CIMOSType_CIMOS_gNewSense_64, VBOXOSTYPE_gNewSense_x64 }, + { ovf::CIMOSType_CIMOS_Dragora, VBOXOSTYPE_Dragora }, @@ -1103,17 +825,28 @@ + { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic }, + { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux }, + -+ // GNU/Linux free distros that we have support for but CIM doesn't -+ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Parabola }, -+ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Parabola_x64 }, -+ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Blag }, -+ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Blag_x64 }, -+ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Ututo }, -+ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Ututo_x64 }, - - }; ++ // Free GNU/Linux distros that we have support for but CIM doesn't ++ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Parabola }, ++ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Parabola_x64 }, ++ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Blag }, ++ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Blag_x64 }, ++ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Ututo }, ++ { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Ututo_x64 }, ++ ++ // Non-free GNU/Linux distros + { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, + { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, + { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, +@@ -110,7 +135,7 @@ + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, + { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, -@@ -151,53 +90,32 @@ +- // types that we have support for but CIM doesn't ++ // Non-free GNU/Linux distros and non-free operating systems types that we have support for but CIM doesn't + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, + { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, + { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, +@@ -151,53 +176,72 @@ /* These are the 32-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern[] = { @@ -1143,18 +876,43 @@ - {"Windows 3.", VBOXOSTYPE_Win31}, - {"DOS", VBOXOSTYPE_DOS}, - {"OS2", VBOXOSTYPE_OS2} -+ {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola}, -+ {"gNewSense", VBOXOSTYPE_gNewSense}, -+ {"Blag Linux and GNU", VBOXOSTYPE_Blag}, -+ {"Dragora", VBOXOSTYPE_Dragora}, -+ {"Ututo XS", VBOXOSTYPE_Ututo}, -+ {"Musix", VBOXOSTYPE_Musix}, -+ {"Trisquel", VBOXOSTYPE_Trisquel}, -+ {"Dyne:bolic", VBOXOSTYPE_Dynebolic}, -+ {"Venenux", VBOXOSTYPE_Venenux}, -+ {"GNU", VBOXOSTYPE_GNU}, -+ {"GNU-Hurd", VBOXOSTYPE_GNUHurd}, -+ {"GNU/Linux", VBOXOSTYPE_GNULinux}, ++ {"Windows NT", VBOXOSTYPE_WinNT4}, ++ {"Windows XP", VBOXOSTYPE_WinXP}, ++ {"Windows 2000", VBOXOSTYPE_Win2k}, ++ {"Windows 2003", VBOXOSTYPE_Win2k3}, ++ {"Windows Vista", VBOXOSTYPE_WinVista}, ++ {"Windows 2008", VBOXOSTYPE_Win2k8}, ++ {"SUSE", VBOXOSTYPE_OpenSUSE}, ++ {"Novell", VBOXOSTYPE_OpenSUSE}, ++ {"Red Hat", VBOXOSTYPE_RedHat}, ++ {"Mandriva", VBOXOSTYPE_Mandriva}, ++ {"Ubuntu", VBOXOSTYPE_Ubuntu}, ++ {"Debian", VBOXOSTYPE_Debian}, ++ {"QNX", VBOXOSTYPE_QNX}, ++ {"GNU/Linux 2.4", VBOXOSTYPE_Linux24}, ++ {"GNU/Linux 2.6", VBOXOSTYPE_Linux26}, ++ {"GNU/Linux", VBOXOSTYPE_Linux}, ++ {"OpenSolaris", VBOXOSTYPE_OpenSolaris}, ++ {"Solaris", VBOXOSTYPE_OpenSolaris}, ++ {"FreeBSD", VBOXOSTYPE_FreeBSD}, ++ {"NetBSD", VBOXOSTYPE_NetBSD}, ++ {"Windows 95", VBOXOSTYPE_Win95}, ++ {"Windows 98", VBOXOSTYPE_Win98}, ++ {"Windows Me", VBOXOSTYPE_WinMe}, ++ {"Windows 3.", VBOXOSTYPE_Win31}, ++ {"DOS", VBOXOSTYPE_DOS}, ++ {"OS2", VBOXOSTYPE_OS2}, ++ {"Parabola", VBOXOSTYPE_Parabola}, ++ {"gNewSense", VBOXOSTYPE_gNewSense}, ++ {"Blag", VBOXOSTYPE_Blag}, ++ {"Dragora", VBOXOSTYPE_Dragora}, ++ {"Ututo XS", VBOXOSTYPE_Ututo}, ++ {"Musix", VBOXOSTYPE_Musix}, ++ {"Trisquel", VBOXOSTYPE_Trisquel}, ++ {"Dyne:bolic", VBOXOSTYPE_Dynebolic}, ++ {"Venenux", VBOXOSTYPE_Venenux}, ++ {"GNU", VBOXOSTYPE_GNU}, ++ {"GNU-Hurd", VBOXOSTYPE_GNUHurd}, }; /* These are the 64-Bit ones. They are sorted by priority. */ @@ -1176,190 +934,65 @@ - {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64}, - {"Solaris", VBOXOSTYPE_OpenSolaris_x64}, - {"FreeBSD", VBOXOSTYPE_FreeBSD_x64}, -+ {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola_x64}, -+ {"gNewSense", VBOXOSTYPE_gNewSense_x64}, -+ {"Blag Linux and GNU", VBOXOSTYPE_Blag_x64}, -+ {"Dragora", VBOXOSTYPE_Dragora_x64}, -+ {"Ututo XS", VBOXOSTYPE_Ututo_x64}, -+ {"Musix", VBOXOSTYPE_Musix_x64}, -+ {"Trisquel", VBOXOSTYPE_Trisquel_x64}, -+ {"GNU", VBOXOSTYPE_GNU_x64}, -+ {"GNU/Linux", VBOXOSTYPE_GNULinux_x64}, ++ {"Windows XP", VBOXOSTYPE_WinXP_x64}, ++ {"Windows 2003", VBOXOSTYPE_Win2k3_x64}, ++ {"Windows Vista", VBOXOSTYPE_WinVista_x64}, ++ {"Windows 2008", VBOXOSTYPE_Win2k8_x64}, ++ {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, ++ {"Novell", VBOXOSTYPE_OpenSUSE_x64}, ++ {"Red Hat", VBOXOSTYPE_RedHat_x64}, ++ {"Mandriva", VBOXOSTYPE_Mandriva_x64}, ++ {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, ++ {"Debian", VBOXOSTYPE_Debian_x64}, ++ {"GNU/Linux 2.4", VBOXOSTYPE_Linux24_x64}, ++ {"GNU/Linux 2.6", VBOXOSTYPE_Linux26_x64}, ++ {"GNU/Linux", VBOXOSTYPE_Linux26_x64}, ++ {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64}, ++ {"Solaris", VBOXOSTYPE_OpenSolaris_x64}, ++ {"FreeBSD", VBOXOSTYPE_FreeBSD_x64}, ++ {"Parabola", VBOXOSTYPE_Parabola_x64}, ++ {"gNewSense", VBOXOSTYPE_gNewSense_x64}, ++ {"Blag", VBOXOSTYPE_Blag_x64}, ++ {"Dragora", VBOXOSTYPE_Dragora_x64}, ++ {"Ututo XS", VBOXOSTYPE_Ututo_x64}, ++ {"Musix", VBOXOSTYPE_Musix_x64}, ++ {"Trisquel", VBOXOSTYPE_Trisquel_x64}, ++ {"GNU", VBOXOSTYPE_GNU_x64}, }; /** ---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ovfreader.h 2012-06-20 10:17:34.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/include/ovfreader.h 2012-07-26 03:51:21.807619186 -0300 -@@ -34,119 +34,24 @@ - - enum CIMOSType_T - { -- CIMOSType_CIMOS_Unknown = 0, -- CIMOSType_CIMOS_Other = 1, -- CIMOSType_CIMOS_MACOS = 2, -- CIMOSType_CIMOS_ATTUNIX = 3, -- CIMOSType_CIMOS_DGUX = 4, -- CIMOSType_CIMOS_DECNT = 5, -- CIMOSType_CIMOS_Tru64UNIX = 6, -- CIMOSType_CIMOS_OpenVMS = 7, -- CIMOSType_CIMOS_HPUX = 8, -- CIMOSType_CIMOS_AIX = 9, -- CIMOSType_CIMOS_MVS = 10, -- CIMOSType_CIMOS_OS400 = 11, -- CIMOSType_CIMOS_OS2 = 12, -- CIMOSType_CIMOS_JavaVM = 13, -- CIMOSType_CIMOS_MSDOS = 14, -- CIMOSType_CIMOS_WIN3x = 15, -- CIMOSType_CIMOS_WIN95 = 16, -- CIMOSType_CIMOS_WIN98 = 17, -- CIMOSType_CIMOS_WINNT = 18, -- CIMOSType_CIMOS_WINCE = 19, -- CIMOSType_CIMOS_NCR3000 = 20, -- CIMOSType_CIMOS_NetWare = 21, -- CIMOSType_CIMOS_OSF = 22, -- CIMOSType_CIMOS_DCOS = 23, -- CIMOSType_CIMOS_ReliantUNIX = 24, -- CIMOSType_CIMOS_SCOUnixWare = 25, -- CIMOSType_CIMOS_SCOOpenServer = 26, -- CIMOSType_CIMOS_Sequent = 27, -- CIMOSType_CIMOS_IRIX = 28, -- CIMOSType_CIMOS_Solaris = 29, -- CIMOSType_CIMOS_SunOS = 30, -- CIMOSType_CIMOS_U6000 = 31, -- CIMOSType_CIMOS_ASERIES = 32, -- CIMOSType_CIMOS_HPNonStopOS = 33, -- CIMOSType_CIMOS_HPNonStopOSS = 34, -- CIMOSType_CIMOS_BS2000 = 35, -- CIMOSType_CIMOS_LINUX = 36, -- CIMOSType_CIMOS_Lynx = 37, -- CIMOSType_CIMOS_XENIX = 38, -- CIMOSType_CIMOS_VM = 39, -- CIMOSType_CIMOS_InteractiveUNIX = 40, -- CIMOSType_CIMOS_BSDUNIX = 41, -- CIMOSType_CIMOS_FreeBSD = 42, -- CIMOSType_CIMOS_NetBSD = 43, -- CIMOSType_CIMOS_GNUHurd = 44, -- CIMOSType_CIMOS_OS9 = 45, -- CIMOSType_CIMOS_MACHKernel = 46, -- CIMOSType_CIMOS_Inferno = 47, -- CIMOSType_CIMOS_QNX = 48, -- CIMOSType_CIMOS_EPOC = 49, -- CIMOSType_CIMOS_IxWorks = 50, -- CIMOSType_CIMOS_VxWorks = 51, -- CIMOSType_CIMOS_MiNT = 52, -- CIMOSType_CIMOS_BeOS = 53, -- CIMOSType_CIMOS_HPMPE = 54, -- CIMOSType_CIMOS_NextStep = 55, -- CIMOSType_CIMOS_PalmPilot = 56, -- CIMOSType_CIMOS_Rhapsody = 57, -- CIMOSType_CIMOS_Windows2000 = 58, -- CIMOSType_CIMOS_Dedicated = 59, -- CIMOSType_CIMOS_OS390 = 60, -- CIMOSType_CIMOS_VSE = 61, -- CIMOSType_CIMOS_TPF = 62, -- CIMOSType_CIMOS_WindowsMe = 63, -- CIMOSType_CIMOS_CalderaOpenUNIX = 64, -- CIMOSType_CIMOS_OpenBSD = 65, -- CIMOSType_CIMOS_NotApplicable = 66, -- CIMOSType_CIMOS_WindowsXP = 67, -- CIMOSType_CIMOS_zOS = 68, -- CIMOSType_CIMOS_MicrosoftWindowsServer2003 = 69, -- CIMOSType_CIMOS_MicrosoftWindowsServer2003_64 = 70, -- CIMOSType_CIMOS_WindowsXP_64 = 71, -- CIMOSType_CIMOS_WindowsXPEmbedded = 72, -- CIMOSType_CIMOS_WindowsVista = 73, -- CIMOSType_CIMOS_WindowsVista_64 = 74, -- CIMOSType_CIMOS_WindowsEmbeddedforPointofService = 75, -- CIMOSType_CIMOS_MicrosoftWindowsServer2008 = 76, -- CIMOSType_CIMOS_MicrosoftWindowsServer2008_64 = 77, -- CIMOSType_CIMOS_FreeBSD_64 = 78, -- CIMOSType_CIMOS_RedHatEnterpriseLinux = 79, -- CIMOSType_CIMOS_RedHatEnterpriseLinux_64 = 80, -- CIMOSType_CIMOS_Solaris_64 = 81, -- CIMOSType_CIMOS_SUSE = 82, -- CIMOSType_CIMOS_SUSE_64 = 83, -- CIMOSType_CIMOS_SLES = 84, -- CIMOSType_CIMOS_SLES_64 = 85, -- CIMOSType_CIMOS_NovellOES = 86, -- CIMOSType_CIMOS_NovellLinuxDesktop = 87, -- CIMOSType_CIMOS_SunJavaDesktopSystem = 88, -- CIMOSType_CIMOS_Mandriva = 89, -- CIMOSType_CIMOS_Mandriva_64 = 90, -- CIMOSType_CIMOS_TurboLinux = 91, -- CIMOSType_CIMOS_TurboLinux_64 = 92, -- CIMOSType_CIMOS_Ubuntu = 93, -- CIMOSType_CIMOS_Ubuntu_64 = 94, -- CIMOSType_CIMOS_Debian = 95, -- CIMOSType_CIMOS_Debian_64 = 96, -- CIMOSType_CIMOS_Linux_2_4_x = 97, -- CIMOSType_CIMOS_Linux_2_4_x_64 = 98, -- CIMOSType_CIMOS_Linux_2_6_x = 99, -- CIMOSType_CIMOS_Linux_2_6_x_64 = 100, -- CIMOSType_CIMOS_Linux_64 = 101, -- CIMOSType_CIMOS_Other_64 = 102, -- // types added with CIM 2.25.0 follow: -- CIMOSType_CIMOS_WindowsServer2008R2 = 103, -- CIMOSType_CIMOS_VMwareESXi = 104, -- CIMOSType_CIMOS_Windows7 = 105, -- CIMOSType_CIMOS_CentOS = 106, -- CIMOSType_CIMOS_CentOS_64 = 107, -- CIMOSType_CIMOS_OracleEnterpriseLinux = 108, -- CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, +--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h 2011-04-28 05:00:56.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h 2012-10-03 17:13:50.738308572 -0300 +@@ -145,8 +145,20 @@ + CIMOSType_CIMOS_CentOS_64 = 107, + CIMOSType_CIMOS_OracleEnterpriseLinux = 108, + CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109, - CIMOSType_CIMOS_eComStation = 110 -- // no new types added with CIM 2.26.0 -+ CIMOSType_CIMOS_Unknown = 0, -+ CIMOSType_CIMOS_Other = 1, -+ CIMOSType_CIMOS_Other_64 = 2, -+ CIMOSType_CIMOS_gNewSense = 3, -+ CIMOSType_CIMOS_gNewSense_64 = 4, -+ CIMOSType_CIMOS_Dragora = 5, -+ CIMOSType_CIMOS_Dragora_64 = 6, -+ CIMOSType_CIMOS_Musix = 7, -+ CIMOSType_CIMOS_Musix_64 = 8, -+ CIMOSType_CIMOS_Trisquel = 9, -+ CIMOSType_CIMOS_Trisquel_64 = 10, -+ CIMOSType_CIMOS_Dynebolic = 11, -+ CIMOSType_CIMOS_Venenux = 12, -+ CIMOSType_CIMOS_GNU = 13, -+ CIMOSType_CIMOS_GNU_64 = 14, -+ CIMOSType_CIMOS_GNUHurd = 15, -+ CIMOSType_CIMOS_GNULinux = 16, -+ CIMOSType_CIMOS_GNULinux_64 = 17 ++ CIMOSType_CIMOS_eComStation = 110, + // no new types added with CIM 2.26.0 ++ CIMOSType_CIMOS_gNewSense = 111, ++ CIMOSType_CIMOS_gNewSense_64 = 112, ++ CIMOSType_CIMOS_Dragora = 113, ++ CIMOSType_CIMOS_Dragora_64 = 114, ++ CIMOSType_CIMOS_Musix = 115, ++ CIMOSType_CIMOS_Musix_64 = 116, ++ CIMOSType_CIMOS_Trisquel = 117, ++ CIMOSType_CIMOS_Trisquel_64 = 118, ++ CIMOSType_CIMOS_Dynebolic = 119, ++ CIMOSType_CIMOS_Venenux = 120, ++ CIMOSType_CIMOS_GNU = 121, ++ CIMOSType_CIMOS_GNU_64 = 122 }; ---- VirtualBox-4.1.18.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-06-20 10:09:01.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-07-26 15:32:55.309812685 -0300 -@@ -622,16 +622,16 @@ - * Call the common device extension initializer. - */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86) -- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26; -+ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux; - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64) -- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64; -+ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64; - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86) -- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24; -+ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux; - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64) -- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64; -+ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64; - #else - # warning "huh? which arch + version is this?" -- VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux; -+ VBOXOSTYPE enmOsType = VBOXOSTYPE_GNULinux; - #endif - rc = VBoxGuestInitDevExt(&g_DevExt, - g_IOPortBase, --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-09-18 22:43:54.956086896 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-10-03 22:49:11.871882837 -0300 @@ -141,7 +141,7 @@ #ifdef VBOX_WITH_VIDEOHWACCEL /* Check if 2D video acceleration supported by the guest OS type: */ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); - m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows"; -+ m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Other"; ++ m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs"; #endif /* VBOX_WITH_VIDEOHWACCEL */ #ifdef VBOX_WITH_CRHGSMI /* Check if WDDM mode supported by the guest OS type: */ diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index 3bce203ef..b6d804eb7 100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -20,18 +20,6 @@ utils() { # arg 1: the new package version post_install() { - cat << EOF - virtualbox-libre is a libre version of VirtualBox without Oracle VM VirtualBox - Extension Pack support and includes a modified list with free distros presets - endorsed by the Free Software Foundation for the virtual machine creation wizard. - Non-free distros and others OS presets were removed. - - It could generate problems with virtual machines created on VirtualBox from - others distros or operating systems. - - To solve it, read https://parabolagnulinux.org/news/virtualbox-libre-new-version -EOF - getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers utils } diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD index 592c4a7bf..67ce115bb 100644 --- a/pcr/ffmpeg-static/PKGBUILD +++ b/pcr/ffmpeg-static/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=ffmpeg-static -pkgver=0.11.2 +pkgver=1.0 pkgrel=1 epoch=1 pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library' @@ -17,7 +17,7 @@ makedepends=(yasm libvdpau) provides=(${pkgname%-static}) conflicts=(${pkgname%-static}) source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2) -md5sums=(93c1908022567b321df74db7214da6ac) +md5sums=(3ed526cea20c1bffb5a37f7730f710bd) build() { cd ${pkgname%-static}-$pkgver diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index 91c6c9175..bb850eec2 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -8,14 +8,14 @@ pkgname=zoneminder pkgver=1.25.0 -pkgrel=16 +pkgrel=17 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=(i686 x86_64 mips64el) backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf) url=http://www.$pkgname.com license=(GPL) depends=( - apache cambozola ffmpeg gnutls mysql perl-archive-zip perl-date-manip + apache cambozola ffmpeg-static gnutls mysql perl-archive-zip perl-date-manip perl-dbd-mysql perl-dbi perl-expect perl-libwww perl-mime-lite perl-mime-tools perl-php-serialization perl-net-sftp-foreign perl-sys-mmap perl-time-modules perl-x10 php php-apache php-gd php-mcrypt @@ -24,21 +24,17 @@ makedepends=(netpbm) install=$pkgname.install source=( http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz - patch-ffmpeg-0.11.patch - patch-libavcodec-detection.patch - $pkgname-1.25.0-kernel35.patch httpd-zm.conf zm.rc.d $pkgname.service + patch-ffmpeg-0.11.patch ) md5sums=( eaefa14befd482154970541252aa1a39 - 81c8be870260142e2633eedf73c72040 - 94bf5d95fe5429f7df458ddfbabf0c12 - 48a3c48394e18bf072f7b32730db18df - 831e3538facff18e27d402e36dbd6b8d + 25ad042b501aaad98cbe4e05ca0a96c2 034b61cda8849fc3001849e76ef26041 7487cc72ead82aea0bc78f2e4106ae1a + 81c8be870260142e2633eedf73c72040 ) build() { cd $srcdir/ZoneMinder-$pkgver @@ -47,65 +43,93 @@ build() { ZM_SSL_LIB=gnutls # Patch for GCC 4.7.x - sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_logger.cpp - sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_thread.h + sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/' src/zm_logger.cpp + sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/' src/zm_thread.h - # Patch for support new ffmpeg - patch -p1 < $srcdir/patch-ffmpeg-0.11.patch + # Patch for disable ZM_CHECK_FOR_UPDATES + sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for support html5 video and flv + sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; + /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\ + scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in - # Patch for correct libavcodec detection - patch -p0 < $srcdir/patch-libavcodec-detection.patch + # Patch for wrong "suppported" + sed -i -e 's/suppported/supported/' src/zm_local_camera.cpp - # Patch for type cast in kernel3.5 - patch -p0 < $srcdir/$pkgname-1.25.0-kernel35.patch + # Patch for type cast in linux-libre kernel 3.5 + sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\ + src/zm_local_camera.cpp + + # Patch for drop custom perl install paths + sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d; + s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\ + configure.ac + + # Patch for support new ffmpeg + patch -p1 < $srcdir/patch-ffmpeg-0.11.patch +# sed -i -e 's/if ( av_open_input_file( \&mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )/if ( avformat_open_input( \&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )/; +# s/if ( avcodec_open( mCodecContext, mCodec ) < 0 )/if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )/'\ +# src/zm_ffmpeg_camera.cpp +# sed -i -e 's/if ( av_set_parameters(ofc, NULL) < 0 )/\/\*\n \* Removed in last ffmpeg\n \* if ( av_set_parameters(ofc, NULL) < 0 )/; +# /Panic( "Invalid output format parameters" );/,+1 s/}/}\*/; +# /if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )/ s/URL_WRONLY/AVIO_FLAG_WRITE/; +# s/av_write_header(ofc);/avformat_write_header(ofc, NULL);/'\ +# src/zm_mpeg.cpp + sed -i -e 's/avcodec_init/avcodec_open/'\ + configure{,.ac} + + # Patch for support ffmpeg with <libavutil/mathematics.h> and C library + sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/ + s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\ + src/zm_ffmpeg.h + sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/; + s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/; + s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\ + configure.ac + + # Patch for wrong install run, tmp and log dir + sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d; + / ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d; + / ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d; + / ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d; + / ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d' \ + Makefile.{am,in} ./configure --prefix=/usr \ --build \ - --enable-crashtrace=yes \ - --enable-debug=yes \ + --enable-crashtrace=no \ + --enable-debug=no \ --enable-mmap=yes \ - --mandir=/usr/share/man \ --sysconfdir=/etc \ --with-cgidir=/usr/lib/$pkgname/cgi-bin \ --with-ffmpeg=/usr \ --with-libarch=lib \ --with-mysql=/usr \ - --with-webdir=/usr/share/$pkgname \ + --with-webdir=/usr/share/$pkgname/www \ --with-webgroup=http \ + --with-webhost=localhost \ --with-webuser=http + make V=0 } package() { cd $srcdir/ZoneMinder-$pkgver - make DESTDIR=$pkgdir \ - ZM_LOGDIR=$pkgdir/var/log/zm \ - ZM_RUNDIR=$pkgdir/run \ - ZM_TMPDIR=$pkgdir/tmp \ - install + make DESTDIR=$pkgdir install - rmdir $pkgdir/run - rmdir $pkgdir/tmp + mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},usr/{lib/{systemd/system,$pkgname/cgi-bin},share/{license/$pkgname,$pkgname/{db,www}}},var/{cache/$pkgname,log/zm}} - mkdir -p $pkgdir/etc/httpd/conf/extra - mkdir -p $pkgdir/etc/rc.d - mkdir -p $pkgdir/usr/lib/systemd/system - mkdir -p $pkgdir/usr/share/license/$pkgname - mkdir -p $pkgdir/usr/share/$pkgname/db - mkdir -p $pkgdir/var/cache/$pkgname + chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/zm}} for i in events images temp; do - mv $pkgdir/usr/share/$pkgname/$i $pkgdir/var/cache/$pkgname/$i - ln -s /var/cache/$pkgname/$i $pkgdir/usr/share/$pkgname/$i + mv $pkgdir/usr/share/$pkgname/www/$i $pkgdir/var/cache/$pkgname/$i + ln -s /var/cache/$pkgname/$i $pkgdir/usr/share/$pkgname/www/$i done - ln -s /usr/lib/$pkgname/cgi-bin $pkgdir/usr/share/$pkgname - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname - - chown http.http $pkgdir/etc/zm.conf - chown -R http.http $pkgdir/var/cache/$pkgname - chown http.http $pkgdir/var/log/zm + ln -s /usr/lib/$pkgname/cgi-bin $pkgdir/usr/share/$pkgname/www + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname/www install -D -m 644 $srcdir/httpd-zm.conf $pkgdir/etc/httpd/conf/extra install -D -m 644 $srcdir/zm.rc.d $pkgdir/etc/rc.d/zm diff --git a/pcr/zoneminder/httpd-zm.conf b/pcr/zoneminder/httpd-zm.conf index e48ea9fc6..8c6356aec 100644 --- a/pcr/zoneminder/httpd-zm.conf +++ b/pcr/zoneminder/httpd-zm.conf @@ -1,20 +1,20 @@ # /etc/httpd/conf/extra/httpd-zm.conf # Config for zoneminder web app -Alias /zm "/usr/share/zoneminder" -<Directory "/usr/share/zoneminder"> +Alias /zm "/usr/share/zoneminder/www" +<Directory "/usr/share/zoneminder/www"> Options -Indexes MultiViews FollowSymLinks - AllowOverride All + AllowOverride None Order allow,deny Allow from all # The code unfortunately uses short tags in many places - php_value short_open_tag 1 + php_value short_open_tag On </Directory> ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin" <Directory "/usr/lib/zoneminder/cgi-bin"> - AllowOverride All - Options ExecCGI - Order allow,deny - Allow from all + AllowOverride None + Options ExecCGI FollowSymLinks + Order allow,deny + Allow from all </Directory> diff --git a/pcr/zoneminder/patch-ffmpeg-configure.patch b/pcr/zoneminder/patch-ffmpeg-configure.patch new file mode 100644 index 000000000..ba1674a4a --- /dev/null +++ b/pcr/zoneminder/patch-ffmpeg-configure.patch @@ -0,0 +1,26 @@ +--- configure.old 2011-08-23 12:10:37.000000000 -0300 ++++ configure 2012-09-26 16:23:33.211940267 -0300 +@@ -3026,8 +3026,8 @@ + fi + + +-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}" +-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include" ++FFMPEG_LIBS=`pkg-config --cflags libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale` ++FFMPEG_CFLAGS=`pkg-config --cflags libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale` + + + +--- configure.ac.old 2011-08-23 12:10:32.000000000 -0300 ++++ configure.ac 2012-09-26 18:16:44.146848335 -0300 +@@ -88,8 +88,8 @@ + e.g. --with-ffmpeg=/usr/local]) + ) + AC_SUBST(FFMPEG_PREFIX) +-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}" +-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include" ++FFMPEG_LIBS=`pkg-config --libs libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale` ++FFMPEG_CFLAGS=`pkg-config --libs libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale` + AC_SUBST(FFMPEG_LIBS) + AC_SUBST(FFMPEG_CFLAGS) + diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index 3ade5355e..922aaad9b 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -1,14 +1,14 @@ pre_install() { set -e abort=false - if [ -L /usr/share/zoneminder/events ]; then - l=$(readlink /usr/share/zoneminder/events) + if [ -L /usr/share/zoneminder/www/events ]; then + l=$(readlink /usr/share/zoneminder/www/events) if [ $l != /var/cache/zoneminder/events ]; then abort=true fi fi - if [ -L /usr/share/zoneminder/images ]; then - l=$(readlink /usr/share/zoneminder/images ) + if [ -L /usr/share/zoneminder/www/images ]; then + l=$(readlink /usr/share/zoneminder/www/images ) if [ $l != /var/cache/zoneminder/images ]; then abort=true fi @@ -16,7 +16,7 @@ pre_install() { if [ $abort = true ]; then cat >&2 << EOF Aborting installation of zoneminder due to non-default symlinks in -/usr/share/zoneminder for the images and/or events directory, which could +/usr/share/zoneminder/www for the images and/or events directory, which could result in loss of data. Please move your data in each of these directories to /var/cache/zoneminder before installing zoneminder from the package. EOF @@ -26,18 +26,16 @@ EOF } post_install() { - mkdir /usr/share/zoneminder/backup - mkdir /usr/share/zoneminder/socks + mkdir /usr/share/zoneminder/www/backup + mkdir /usr/share/zoneminder/www/socks cat << EOF Note: ==> To run Zoneminder, you must install the database running mysql service (as root): ==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd) ==> and add Zoneminder database typing: -==> mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload -==> cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p -==> echo 'grant lock tables, alter,select,insert,update,delete on zm.*'"\ -==> "' to 'zmuser'@localhost identified by "zmpass";' | -==> mysql --defaults-file=/etc/mysql/my.cnf -p mysql" +==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload" +==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p" +==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" Note: ==> You must uncomment that line in /etc/php/php.ini: @@ -50,20 +48,18 @@ Note: ==> "extension=session.so" ==> "extension=sockets.so" -==> Check /etc/php/php.ini and make sure short_open_tag = On -==> or ZoneMinder will not work. - ==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and ==> "/usr/share/zoneminder" like so -==> open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder +==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder/www" ==> Otherwise ZoneMinder will be unable to read /etc/zm.conf ==> or display its own web directory Note: ==> You must edit /etc/httpd/conf/httpd.conf and add the line: -==> LoadModule php5_module modules/libphp5.so +==> "LoadModule php5_module modules/libphp5.so" ==> and: -==> Include /etc/httpd/conf/extra/httpd-zm.conf +==> "Include /etc/httpd/conf/extra/php5_module.conf" +==> "Include /etc/httpd/conf/extra/httpd-zm.conf" EOF } @@ -82,6 +78,7 @@ Note: ==> Disable http with php if it isn't needed with others servers, ==> comment or remove that lines in /etc/httpd/conf/httpd.conf: ==> "LoadModule php5_module modules/libphp5.so" +==> "Include /etc/httpd/conf/extra/php5_module.conf" ==> "Include /etc/httpd/conf/extra/httpd-zm.conf" ==> Disable php with mysql if it isn't needed with others servers, @@ -94,7 +91,7 @@ Note: ==> "extension=session.so" ==> "extension=sockets.so" -==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder" +==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder/www" ==> in the open_basedir. EOF } diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD index ad995b59e..089744aa4 100644 --- a/staging/kdebindings-python/PKGBUILD +++ b/staging/kdebindings-python/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 160989 2012-06-07 20:23:50Z andrea $ +# $Id: PKGBUILD 167875 2012-10-03 15:10:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.8.4 -pkgrel=1 -url='http://kde.org/' +pkgver=4.9.2 +pkgrel=2 +url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') -source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' + 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz" + 'pyqt495.patch') +sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11' + '17b699b9096d10e118ef49fbe5e4cd5687e676a5') build() { export PYTHONDONTWRITEBYTECODE="TRUE" - cd "${srcdir}" + cd pykde4-${pkgver} + patch -p1 -i "${srcdir}"/pyqt495.patch + cd ../ + mkdir build cd build cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 make cd .. diff --git a/staging/kdebindings-python/pyqt495.patch b/staging/kdebindings-python/pyqt495.patch new file mode 100644 index 000000000..b8a9df258 --- /dev/null +++ b/staging/kdebindings-python/pyqt495.patch @@ -0,0 +1,95 @@ +From: Luca Beltrame <lbeltrame@kde.org> +Date: Mon, 01 Oct 2012 18:47:56 +0000 +Subject: Remove duplicated QVector<int> definition, since it's in PyQt now. +X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 +--- +Remove duplicated QVector<int> definition, since it's in PyQt now. +Simon, if you have time, please review if everything is OK. + +CCMAIL: simon@simonzone.com +--- + + +--- a/sip/kdecore/typedefs.sip ++++ b/sip/kdecore/typedefs.sip +@@ -951,78 +951,4 @@ + %End + }; + +-%MappedType QVector<int> +-{ +-%TypeHeaderCode +-#include <qvector.h> +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) +- { +- int t = (sipCpp->at(i)); +- +-#if PY_MAJOR_VERSION >= 3 +- PyObject *tobj = PyLong_FromLong(t); +-#else +- PyObject *tobj = PyInt_FromLong(t); +-#endif +- +- PyList_SET_ITEM(l, i, tobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- { +- if (!PyList_Check(sipPy)) +- return 0; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +-#if PY_MAJOR_VERSION >= 3 +- if (!PyNumber_Check(tobj)) +-#else +- if (!PyInt_Check(tobj)) +-#endif +- return 0; +- } +- return 1; +- } +- +- QVector<int> *qv = new QVector<int>; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +- #if PY_MAJOR_VERSION >= 3 +- int t = PyLong_AsLong (tobj); +-#else +- int t = PyInt_AS_LONG (tobj); +-#endif +- +- if (*sipIsErr) +- { +- delete qv; +- return 0; +- } +- +- qv->append(t); +- } +- +- *sipCppPtr = qv; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- ++ + diff --git a/staging/qscintilla/PKGBUILD b/staging/qscintilla/PKGBUILD new file mode 100644 index 000000000..acb9eadfd --- /dev/null +++ b/staging/qscintilla/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 167919 2012-10-03 20:22:14Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> + +pkgbase=qscintilla +pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' + 'python-qscintilla-common') +pkgver=2.6.2 +pkgrel=3 +license=('GPL') +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" +makedepends=('python2-pyqt' 'pyqt' 'chrpath') +source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" + 'configure.py-objdir-support.diff') +md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' + '8cf9c06252e2f11ab00e62848e322fd3') + +build() { + cd "${srcdir}/QScintilla-gpl-${pkgver}" + patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" + + cd Qt4Qt5 + qmake qscintilla.pro + make + + cd ../designer-Qt4 + qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + make + + cd ../ + cp -rf Python Python2 + cd Python + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 + make + + cd ../Python2 + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 + make +} + +package_qscintilla() { + pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class" + depends=('qt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4" + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python-qscintilla-common() { + pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + depends=('qscintilla') + + cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by python-qscintilla + rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" +} + +package_python-qscintilla() { + pkgdesc="Python 3.x bindings for QScintilla2" + depends=('python-qscintilla-common' 'pyqt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" +} + +package_python2-qscintilla() { + pkgdesc="Python 2.x bindings for QScintilla2" + depends=('python-qscintilla-common' 'python2-pyqt') + + cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" + install -Dm755 Qsci.so \ + "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so" +} diff --git a/staging/qscintilla/configure.py-objdir-support.diff b/staging/qscintilla/configure.py-objdir-support.diff new file mode 100644 index 000000000..b595de18c --- /dev/null +++ b/staging/qscintilla/configure.py-objdir-support.diff @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_configure.dpatch by Torsten Marek <shlomme@debian.org> +## +## DP: patch the configure script for the Python bindings to support object dir builds + +@DPATCH@ +Index: qscintilla2-2.4.2/Python/configure.py +=================================================================== +--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100 ++++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100 +@@ -33,6 +33,7 @@ + import glob + import optparse + ++src_dir = os.path.dirname(os.path.abspath(__file__)) + + # Import SIP's configuration module so that we have access to the error + # reporting. Then try and import the configuration modules for both PyQt3 and +@@ -162,7 +163,7 @@ + if os.access(sciglobal, os.F_OK): + # Get the QScintilla version string. + _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR") +- ++ return # Debian: do not check for the installed version, we're good this way. + if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")): + # Because we include the Python bindings with the C++ code we can + # reasonably force the same version to be used and not bother about +@@ -232,9 +233,9 @@ + argv.append(buildfile) + + if pyqt.pyqt_version >= 0x040000: +- argv.append("sip/qscimod4.sip") ++ argv.append(os.path.join(src_dir, "sip/qscimod4.sip")) + else: +- argv.append("sip/qscimod3.sip") ++ argv.append(os.path.join(src_dir, "sip/qscimod3.sip")) + + os.system(" ".join(argv)) + diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD index d29f4d172..18c285073 100644 --- a/staging/systemd/PKGBUILD +++ b/staging/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=193 +pkgver=194 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -17,14 +17,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('732a9de2b1d2a15cab639c987ff9e90e' +md5sums=('0ebb73aea444693b9b86f7a76f5df23c' 'e99e9189aa2f6084ac28b8ddf605aeb8' - '59e91c4d7a69b7bf12c86a9982e37ced' + 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '1f435290db227c3a4f4396f86819227e' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -36,9 +34,6 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 - patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -140,14 +135,9 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') + conflicts=('sysvinit') depends=('sysvinit-tools') - # the initscripts conflict here isn't actually needed, but in order to make - # this package remove both sysvinit and initscripts, the initscripts conflict - # is needed. There's no case in which you would ever want initscripts installed - # without sysvinit, and vice versa, as in both cases, they are unusable. - mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev index 762429983..15124b8f7 100644 --- a/staging/systemd/initcpio-install-udev +++ b/staging/systemd/initcpio-install-udev @@ -7,7 +7,7 @@ build() { add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd add_binary /usr/bin/udevadm - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do add_file "/usr/lib/udev/rules.d/$rules" done for tool in ata_id scsi_id; do diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD index f40858d29..045e5e038 100644 --- a/testing/btrfs-progs/PKGBUILD +++ b/testing/btrfs-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166671 2012-09-15 09:38:19Z tomegun $ +# $Id: PKGBUILD 167942 2012-10-03 23:03:54Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs pkgver=0.19.20120904 -pkgrel=4 +pkgrel=6 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -14,13 +14,19 @@ conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz - 70-btrfs.rules - initcpio-install-btrfs - initcpio-hook-btrfs) + initcpio-install-btrfs + initcpio-hook-btrfs) +install=btrfs.install build() { cd $srcdir/$pkgname-$pkgver make CFLAGS="$CFLAGS" + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" } package() { @@ -31,17 +37,7 @@ package() { mv $pkgdir/usr/man $pkgdir/usr/share/man mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs - - # add udev rule - install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" - - # install mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-btrfs" \ - "$pkgdir/usr/lib/initcpio/install/btrfs" - install -Dm644 "$srcdir/initcpio-hook-btrfs" \ - "$pkgdir/usr/lib/initcpio/hooks/btrfs" } md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2' - '345c62c8b267082361729ca5b647518f' - 'e5186ec3fe8a809b7473470128d1c4ab' + '2d3df276f80bb09813f56a56d6f93ddd' '9fb35142755b477a96cb7292f3d64839') diff --git a/testing/btrfs-progs/btrfs.install b/testing/btrfs-progs/btrfs.install new file mode 100644 index 000000000..077d7529a --- /dev/null +++ b/testing/btrfs-progs/btrfs.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then + echo "btrfs multi-device support now relies on linux 3.6 or later" + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs index aad263378..fb64f12e2 100644 --- a/testing/btrfs-progs/initcpio-install-btrfs +++ b/testing/btrfs-progs/initcpio-install-btrfs @@ -4,13 +4,11 @@ build() { add_module btrfs add_binary btrfs add_runscript - - add_file /usr/lib/udev/rules.d/70-btrfs.rules } help() { cat <<HELPEOF -This hook provides support for multi-device btrfs volumes. +This hook provides support for multi-device btrfs volumes, in the absence of udev. HELPEOF } diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD index d433daf32..edd527ba7 100644 --- a/testing/ghc/PKGBUILD +++ b/testing/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161441 2012-06-11 17:22:19Z tdziedzic $ +# $Id: PKGBUILD 167880 2012-10-03 15:19:04Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Special note for devs looking to upgrade this package: @@ -7,7 +7,7 @@ # This implies that all libraries need to be rebuilt when ghc is rebuilt. pkgname=ghc -pkgver=7.4.2 +pkgver=7.6.1 pkgrel=1 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64') @@ -19,74 +19,64 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') checkdepends=('python2') install='ghc.install' # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... -options=('!makeflags') +#options=('!makeflags') # missing rtl? -provides=('haskell-array=0.4.0.0' - 'haskell-base=4.5.1.0' - 'haskell-binary=0.5.1.0' +provides=('haskell-array=0.4.0.1' + 'haskell-base=4.6.0.0' + 'haskell-binary=0.5.1.1' 'haskell-bin-package-db=0.0.0.0' - 'haskell-bytestring=0.9.2.1' - 'haskell-containers=0.4.2.1' - 'haskell-deepseq=1.3.0.0' - 'haskell-directory=1.1.0.2' - 'haskell-extensible-exceptions=0.1.1.4' - 'haskell-filepath=1.3.0.0' - 'haskell-ghc-prim=0.2.0.0' - 'haskell-haskell2010=1.1.0.1' - 'haskell-haskell98=2.0.0.1' - 'haskell-hoopl=3.8.7.3' - 'haskell-hpc=0.5.1.1' - 'haskell-integer-gmp=0.4.0.0' - 'haskell-old-locale=1.0.0.4' - 'haskell-old-time=1.1.0.0' + 'haskell-bytestring=0.10.0.0' + 'haskell-containers=0.5.0.0' + 'haskell-deepseq=1.3.0.1' + 'haskell-directory=1.2.0.0' + 'haskell-filepath=1.3.0.1' + 'haskell-ghc-prim=0.3.0.0' + 'haskell-haskell2010=1.1.1.0' + 'haskell-haskell98=2.0.0.2' + 'haskell-hoopl=3.9.0.0' + 'haskell-hpc=0.6.0.0' + 'haskell-integer-gmp=0.5.0.0' + 'haskell-old-locale=1.0.0.5' + 'haskell-old-time=1.1.0.1' 'haskell-pretty=1.1.1.0' - 'haskell-process=1.1.0.1' - 'haskell-template-haskell=2.7.0.0' - 'haskell-time=1.4' - 'haskell-unix=2.5.1.1' - 'haskell-cabal=1.14.0' - ) -replaces=('haskell-array<0.4.0.0' - 'haskell-base<4.5.1.0' - 'haskell-binary<0.5.1.0' + 'haskell-process=1.1.0.2' + 'haskell-template-haskell=2.8.0.0' + 'haskell-time=1.4.0.1' + 'haskell-unix=2.6.0.0' + 'haskell-cabal=1.16.0') +replaces=('haskell-array<0.4.0.1' + 'haskell-base<4.6.0.0' + 'haskell-binary<0.5.1.1' 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.9.2.1' - 'haskell-containers<0.4.2.1' - 'haskell-deepseq<1.3.0.0' - 'haskell-directory<1.1.0.2' - 'haskell-extensible-exceptions<0.1.1.4' - 'haskell-filepath<1.3.0.0' - 'haskell-ghc-prim<0.2.0.0' - 'haskell-haskell2010<1.1.0.1' - 'haskell-haskell98<2.0.0.1' - 'haskell-hoopl<3.8.7.3' - 'haskell-hpc<0.5.1.1' - 'haskell-integer-gmp<0.4.0.0' - 'haskell-old-locale<1.0.0.4' - 'haskell-old-time<1.1.0.0' + 'haskell-bytestring<0.10.0.0' + 'haskell-containers<0.5.0.0' + 'haskell-deepseq<1.3.0.1' + 'haskell-directory<1.2.0.0' + 'haskell-filepath<1.3.0.1' + 'haskell-ghc-prim<0.3.0.0' + 'haskell-haskell2010<1.1.1.0' + 'haskell-haskell98<2.0.0.2' + 'haskell-hoopl<3.9.0.0' + 'haskell-hpc<0.6.0.0' + 'haskell-integer-gmp<0.5.0.0' + 'haskell-old-locale<1.0.0.5' + 'haskell-old-time<1.1.0.1' 'haskell-pretty<1.1.1.0' - 'haskell-process<1.1.0.1' - 'haskell-template-haskell<2.7.0.0' - 'haskell-time<1.4' - 'haskell-unix<2.5.1.1' - 'haskell-cabal<1.14.0' - ) + 'haskell-process<1.1.0.2' + 'haskell-template-haskell<2.8.0.0' + 'haskell-time<1.4.0.1' + 'haskell-unix<2.6.0.0' + 'haskell-cabal<1.16.0') source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk' - 'silence-gen_contents_index.diff') -md5sums=('267462db5c5a7c245fb26361b77007c4' - '528005749c761fe6c12a0079bd84fb90' - '88ad4108c26f56fc38466d82aaf9a295' - '2ac480d025b706fc47acc58c54b246bb') + 'build.mk') +md5sums=('e9d892d2970550ec5e70130b3621f6b6' + '0d93c458e3b445a7e524ef6ae459ce11' + 'c367ef26300648ee9b8aca3dee5c9669') build() { cd ghc-${pkgver} - # Silence gen_contents_index for the common case. - # http://hackage.haskell.org/trac/ghc/ticket/5992 - patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff - cp ${srcdir}/build.mk mk/build.mk ./configure \ @@ -96,16 +86,35 @@ build() { } check() { + # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... + unset MAKEFLAGS + cd ghc-${pkgver} # python2 rename sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py - # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 - #make THREADS=9 test + # upstream known failures on both i686 and x86_64: + # ghci.debugger/scripts break011 [bad stderr] (ghci) + # perf/compiler parsing001 [stat not good enough] (normal) + # simplCore/should_compile spec-inline [stderr mismatch] (optasm) + # upstream known failures on i686 only: + # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 make test - # might be some failures + + # enabling threads to speed up + # causes more failures than make test, need to investigate + # upstream known failures on both i686 and x86_64: + # perf/compiler parsing001 [stat not good enough] (normal) + # simplCore/should_compile spec-inline [stderr mismatch] (optasm) + # upstream known failures on i686 only: + # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 + #make THREADS=9 test + + # will most likely cause lots of failures + # enable this when upstream has 0 test failures from a simple 'make test' + # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757 #make fulltest } diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk index 73645a957..bb57594bf 100644 --- a/testing/ghc/build.mk +++ b/testing/ghc/build.mk @@ -10,6 +10,9 @@ # Full build with max optimisation and everything enabled (very slow build) BuildFlavour = perf +# As above but build GHC using the LLVM backend +#BuildFlavour = perf-llvm + # Fast build with optimised libraries, no profiling (RECOMMENDED): #BuildFlavour = quick @@ -51,6 +54,23 @@ endif endif +# ---------------- Perf build using LLVM ------------------------------------- + +ifeq "$(BuildFlavour)" "perf-llvm" + +SRC_HC_OPTS = -O -H64m -fllvm +GhcStage1HcOpts = -O -fllvm +GhcStage2HcOpts = -O2 -fllvm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + # -------- A Fast build ------------------------------------------------------ ifeq "$(BuildFlavour)" "quickest" @@ -151,10 +171,14 @@ endif ifeq "$(BuildFlavour)" "unreg" +# Note that the LLVM backend works in unregisterised mode as well as +# registerised mode. This often makes it a good choice for porting +# GHC. + GhcUnregisterised = YES GhcWithNativeCodeGen = NO -SRC_HC_OPTS = -O -H64m +SRC_HC_OPTS = -O -H64m # -fllvm GhcStage1HcOpts = -O GhcStage2HcOpts = -O2 GhcHcOpts = -Rghc-timing @@ -173,3 +197,4 @@ endif # NoFib settings NoFibWays = STRIP_CMD = : + diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD index fda58f3c9..5eb7da013 100644 --- a/testing/haskell-http/PKGBUILD +++ b/testing/haskell-http/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=HTTP pkgname=haskell-http -pkgver=4000.2.3 +pkgver=4000.2.4 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('872a1e49c3701c61c354f76716d4e3e7') +md5sums=('5edcd9fd16a9cb72a140a29442d514b7') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD index 4b2f73533..f1fa7c286 100644 --- a/testing/haskell-mtl/PKGBUILD +++ b/testing/haskell-mtl/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=mtl pkgname=haskell-mtl -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="Monad transformer library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('0654be687f1492a2ff30cf6f3fb7eed0') +md5sums=('943c110524d96126bfa0e61f7df1ebcd') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD index f3a3cc022..7f5d13fc1 100644 --- a/testing/haskell-network/PKGBUILD +++ b/testing/haskell-network/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=network pkgname=haskell-network -pkgver=2.3.0.14 +pkgver=2.3.1.0 pkgrel=1 pkgdesc="Networking-related facilities" url="http://hackage.haskell.org/package/network" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2') +depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('1e45cc731647acff8b9c33bda085bf2a') +md5sums=('d824db8fc068cab60fa178ab330a57a2') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD index 2ab24a745..9c7c1aafb 100644 --- a/testing/haskell-parsec/PKGBUILD +++ b/testing/haskell-parsec/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=parsec pkgname=haskell-parsec -pkgver=3.1.2 -pkgrel=2 +pkgver=3.1.3 +pkgrel=1 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('c2a75dfd247ae4839e2602b62dc87487') +md5sums=('d72fc94b81153132c61125a1ec52a4a5') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/testing/haskell-random/PKGBUILD b/testing/haskell-random/PKGBUILD index 56b110289..07cc5e2c2 100644 --- a/testing/haskell-random/PKGBUILD +++ b/testing/haskell-random/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=random pkgname=haskell-random pkgver=1.0.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A basic random number generation library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD index 31811e339..5a23030d5 100644 --- a/testing/haskell-text/PKGBUILD +++ b/testing/haskell-text/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=text pkgname=haskell-text -pkgver=0.11.2.1 +pkgver=0.11.2.3 pkgrel=1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('77245df79d10ed5f896a9d3f5b17ee74') +md5sums=('7a469d49a7576fb3a18785cb64d4ee6c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD index c398b1590..c946fe40a 100644 --- a/testing/haskell-transformers/PKGBUILD +++ b/testing/haskell-transformers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161448 2012-06-11 17:22:54Z tdziedzic $ +# $Id: PKGBUILD 167887 2012-10-03 15:19:41Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -6,12 +6,12 @@ _hkgname=transformers pkgname=haskell-transformers pkgver=0.3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=${pkgname}.install md5sums=('852dc0b79cc2bcb39136287d3dd385e5') diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD index 11767ab97..30834b3c1 100644 --- a/testing/haskell-zlib/PKGBUILD +++ b/testing/haskell-zlib/PKGBUILD @@ -6,18 +6,22 @@ _hkgname=zlib pkgname=haskell-zlib pkgver=0.5.3.3 -pkgrel=4 +pkgrel=5 pkgdesc="Compression and decompression in the gzip and zlib formats" url="http://hackage.haskell.org/package/zlib" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'zlib' 'sh') +depends=('ghc=7.6.1-1' 'zlib' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('1649e56d13ce2c6a6a9210227401dbbc') build() { cd ${srcdir}/${_hkgname}-${pkgver} + + # ghc 7.6 includes bytestring 0.10 + sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 8dc086a4a..f895939ef 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -3,29 +3,26 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=193 +pkgver=194 pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'quota-tools' 'xz') -checkdepends=('python') + 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('732a9de2b1d2a15cab639c987ff9e90e' +md5sums=('0ebb73aea444693b9b86f7a76f5df23c' 'e99e9189aa2f6084ac28b8ddf605aeb8' - '59e91c4d7a69b7bf12c86a9982e37ced' + 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '1f435290db227c3a4f4396f86819227e' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -37,9 +34,6 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 - patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -141,14 +135,9 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') + conflicts=('sysvinit') depends=('sysvinit-tools') - # the initscripts conflict here isn't actually needed, but in order to make - # this package remove both sysvinit and initscripts, the initscripts conflict - # is needed. There's no case in which you would ever want initscripts installed - # without sysvinit, and vice versa, as in both cases, they are unusable. - mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" diff --git a/testing/systemd/initcpio-install-udev b/testing/systemd/initcpio-install-udev index 762429983..15124b8f7 100644 --- a/testing/systemd/initcpio-install-udev +++ b/testing/systemd/initcpio-install-udev @@ -7,7 +7,7 @@ build() { add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd add_binary /usr/bin/udevadm - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do add_file "/usr/lib/udev/rules.d/$rules" done for tool in ata_id scsi_id; do diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index e9316da7f..45c057a63 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166886 2012-09-20 22:22:35Z tomegun $ +# $Id: PKGBUILD 167927 2012-10-03 20:37:22Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.22 -pkgrel=6 +pkgrel=7 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install index 35f80e2a2..969a4aecf 100644 --- a/testing/util-linux/util-linux.install +++ b/testing/util-linux/util-linux.install @@ -1,13 +1,4 @@ post_install() { - # create user for uuidd - if ! getent group uuidd >/dev/null; then - groupadd -r uuidd - fi - - if ! getent passwd uuidd >/dev/null; then - useradd -r -s /sbin/nologin -d / -g uuidd uuidd - fi - # we don't want use systemd-tmpfiles here because # the package dependency would create a circular dep. if [ ! -d run/uuidd ]; then @@ -27,13 +18,3 @@ post_upgrade() { post_install } - -post_remove() { - if getent passwd uuidd >/dev/null; then - userdel uuidd - fi - - if getent group uuidd >/dev/null; then - userdel uuidd - fi -} |