diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-04 12:27:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-04 12:27:54 -0300 |
commit | 39b243b89b29a461bba953d0130b32513477efdd (patch) | |
tree | 66e5d5eb3abbd71786bd14bba2a20a9bc5228d73 /community-testing/haskell-tar | |
parent | 399a563eb2c30475d66ced8203aff23d65e540e8 (diff) | |
parent | c3ff6b4da8966c22dcbf0f5d8a957b875242789f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/hedgewars/PKGBUILD
community-testing/alex/PKGBUILD
community-testing/gtk2hs-buildtools/PKGBUILD
community-testing/haddock/PKGBUILD
community-testing/happy/PKGBUILD
community-testing/haskell-bytestring-show/PKGBUILD
community-testing/haskell-cairo/PKGBUILD
community-testing/haskell-dataenc/PKGBUILD
community-testing/haskell-ghc-paths/PKGBUILD
community-testing/haskell-glib/PKGBUILD
community-testing/haskell-gtk/PKGBUILD
community-testing/haskell-haskeline/PKGBUILD
community-testing/haskell-hslogger/PKGBUILD
community-testing/haskell-html/PKGBUILD
community-testing/haskell-pango/PKGBUILD
community-testing/haskell-quickcheck/PKGBUILD
community-testing/haskell-regex-base/PKGBUILD
community-testing/haskell-regex-compat/PKGBUILD
community-testing/haskell-regex-posix/PKGBUILD
community-testing/haskell-stm/PKGBUILD
community-testing/haskell-syb/PKGBUILD
community-testing/haskell-tar/PKGBUILD
community-testing/haskell-terminfo/PKGBUILD
community-testing/haskell-utf8-string/PKGBUILD
community-testing/haskell-x11-xft/PKGBUILD
community-testing/haskell-x11/PKGBUILD
community-testing/haskell-xhtml/PKGBUILD
community-testing/hedgewars/PKGBUILD
community-testing/xmobar/PKGBUILD
community-testing/xmonad-contrib/PKGBUILD
community-testing/xmonad/PKGBUILD
community/osdbattery/PKGBUILD
community/packeth/PKGBUILD
extra/kdenetwork/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/mutter/PKGBUILD
staging/kdebindings-python/PKGBUILD
staging/mesa/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/btrfs-progs/initcpio-install-btrfs
testing/ghc/PKGBUILD
testing/ghc/build.mk
testing/haskell-http/PKGBUILD
testing/haskell-mtl/PKGBUILD
testing/haskell-network/PKGBUILD
testing/haskell-parsec/PKGBUILD
testing/haskell-random/PKGBUILD
testing/haskell-text/PKGBUILD
testing/haskell-transformers/PKGBUILD
testing/haskell-zlib/PKGBUILD
testing/kactivities/PKGBUILD
testing/kdeaccessibility-jovie/PKGBUILD
testing/kdeaccessibility-kaccessible/PKGBUILD
testing/kdeaccessibility-kmag/PKGBUILD
testing/kdeaccessibility-kmousetool/PKGBUILD
testing/kdeaccessibility-kmouth/PKGBUILD
testing/kdeadmin/PKGBUILD
testing/kdeartwork/PKGBUILD
testing/kdebase-konsole/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase/PKGBUILD
testing/kdebindings-kimono/PKGBUILD
testing/kdebindings-korundum/PKGBUILD
testing/kdebindings-kross/PKGBUILD
testing/kdebindings-perlkde/PKGBUILD
testing/kdebindings-perlqt/PKGBUILD
testing/kdebindings-python/PKGBUILD
testing/kdebindings-qtruby/PKGBUILD
testing/kdebindings-qyoto/PKGBUILD
testing/kdebindings-smokegen/PKGBUILD
testing/kdebindings-smokekde/PKGBUILD
testing/kdebindings-smokeqt/PKGBUILD
testing/kdeedu-analitza/PKGBUILD
testing/kdeedu-blinken/PKGBUILD
testing/kdeedu-cantor/PKGBUILD
testing/kdeedu-kalgebra/PKGBUILD
testing/kdeedu-kalzium/PKGBUILD
testing/kdeedu-kanagram/PKGBUILD
testing/kdeedu-kbruch/PKGBUILD
testing/kdeedu-kgeography/PKGBUILD
testing/kdeedu-khangman/PKGBUILD
testing/kdeedu-kig/PKGBUILD
testing/kdeedu-kiten/PKGBUILD
testing/kdeedu-klettres/PKGBUILD
testing/kdeedu-kmplot/PKGBUILD
testing/kdeedu-kstars/PKGBUILD
testing/kdeedu-ktouch/PKGBUILD
testing/kdeedu-kturtle/PKGBUILD
testing/kdeedu-kwordquiz/PKGBUILD
testing/kdeedu-marble/PKGBUILD
testing/kdeedu-pairs/PKGBUILD
testing/kdeedu-parley/PKGBUILD
testing/kdeedu-rocs/PKGBUILD
testing/kdeedu-step/PKGBUILD
testing/kdegames/PKGBUILD
testing/kdegraphics-gwenview/PKGBUILD
testing/kdegraphics-kamera/PKGBUILD
testing/kdegraphics-kcolorchooser/PKGBUILD
testing/kdegraphics-kgamma/PKGBUILD
testing/kdegraphics-kolourpaint/PKGBUILD
testing/kdegraphics-kruler/PKGBUILD
testing/kdegraphics-ksaneplugin/PKGBUILD
testing/kdegraphics-ksnapshot/PKGBUILD
testing/kdegraphics-mobipocket/PKGBUILD
testing/kdegraphics-okular/PKGBUILD
testing/kdegraphics-strigi-analyzer/PKGBUILD
testing/kdegraphics-svgpart/PKGBUILD
testing/kdegraphics-thumbnailers/PKGBUILD
testing/kdemultimedia-audiocd-kio/PKGBUILD
testing/kdemultimedia-dragonplayer/PKGBUILD
testing/kdemultimedia-ffmpegthumbs/PKGBUILD
testing/kdemultimedia-juk/PKGBUILD
testing/kdemultimedia-kmix/PKGBUILD
testing/kdemultimedia-kscd/PKGBUILD
testing/kdemultimedia-mplayerthumbs/PKGBUILD
testing/kdenetwork/PKGBUILD
testing/kdepim-runtime/PKGBUILD
testing/kdepim/PKGBUILD
testing/kdepimlibs/PKGBUILD
testing/kdeplasma-addons/PKGBUILD
testing/kdesdk-kate/PKGBUILD
testing/kdesdk/PKGBUILD
testing/kdetoys/PKGBUILD
testing/kdeutils-filelight/PKGBUILD
testing/kdeutils-kcalc/PKGBUILD
testing/kdeutils-kcharselect/PKGBUILD
testing/kdeutils-kdf/PKGBUILD
testing/kdeutils-kfloppy/PKGBUILD
testing/kdeutils-kgpg/PKGBUILD
testing/kdeutils-kremotecontrol/PKGBUILD
testing/kdeutils-ktimer/PKGBUILD
testing/kdeutils-kwallet/PKGBUILD
testing/kdeutils-superkaramba/PKGBUILD
testing/kdeutils-sweeper/PKGBUILD
testing/kdewebdev/PKGBUILD
testing/libkcddb/PKGBUILD
testing/libkcompactdisc/PKGBUILD
testing/libkdcraw/PKGBUILD
testing/libkdeedu/PKGBUILD
testing/libkexiv2/PKGBUILD
testing/libkipi/PKGBUILD
testing/libksane/PKGBUILD
testing/nepomuk-core/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/initcpio-install-udev
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'community-testing/haskell-tar')
-rw-r--r-- | community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch | 50 |
1 files changed, 50 insertions, 0 deletions
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 + |