root
8 years ago
parent
f23c3e6655
commit
47bbd277d1
@ -1,3 +1,4 @@
|
||||
DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
|
||||
DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
|
||||
DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
|
||||
DIST scribus-1.5.1.tar.xz 78032792 SHA256 1882e68713d91c2ab9d6ec7a251dbbe31a4438ee68e63e62d36770541e6f4a38 SHA512 36de951c5aa190f49486971cb08223a4de85ba256a89c2df4ab0fcaba16480065faf499306efa669c623a36a59fbe09aec0c0572b55ce3f9e4107bb54df9c443 WHIRLPOOL c081db19cb39968577f5af9224a87bb2d44caf322b2860c0e3ec9bd32142d6e5f0c1c998c87ee501a3de98f9311c7b543fdef880773bed2cfd290d03a877c9a9
|
||||
|
||||
@ -0,0 +1,200 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="tk?"
|
||||
|
||||
inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1
|
||||
|
||||
DESCRIPTION="Desktop publishing (DTP) and layout program"
|
||||
HOMEPAGE="http://www.scribus.net/"
|
||||
SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
|
||||
|
||||
#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
|
||||
IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
|
||||
IUSE+=" ${IUSE_LINGUAS// / linguas_}"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
tk? ( scripts )"
|
||||
|
||||
# osg
|
||||
# couple of third_party libs bundled
|
||||
COMMON_DEPEND="
|
||||
${PYTHON_DEPS}
|
||||
app-text/libmspub
|
||||
>=app-text/poppler-0.19.0:=
|
||||
dev-libs/boost
|
||||
dev-libs/hyphen
|
||||
dev-libs/librevenge
|
||||
dev-libs/libxml2
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtopengl:5
|
||||
dev-qt/qtprintsupport:5
|
||||
dev-qt/qtquickcontrols:5
|
||||
dev-qt/qtwebkit:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtxml:5
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype:2
|
||||
media-libs/lcms:2
|
||||
media-libs/libcdr
|
||||
media-libs/libpagemaker
|
||||
media-libs/libpng:0
|
||||
media-libs/libvisio
|
||||
media-libs/tiff:0
|
||||
net-print/cups
|
||||
sys-libs/zlib[minizip]
|
||||
virtual/jpeg:0=
|
||||
>=x11-libs/cairo-1.10.0[X,svg]
|
||||
boost? ( dev-libs/boost )
|
||||
hunspell? ( app-text/hunspell )
|
||||
graphicsmagick? ( media-gfx/graphicsmagick )
|
||||
osg? ( dev-games/openscenegraph )
|
||||
pdf? ( app-text/podofo:0= )
|
||||
scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
|
||||
tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-text/ghostscript-gpl"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-qt/linguist-tools:5
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.0-docdir.patch
|
||||
"${FILESDIR}"/${PN}-1.5.0-QObject.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
rm -r codegen/cheetah || die
|
||||
cat > cmake/modules/FindZLIB.cmake <<- EOF
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(ZLIB minizip zlib)
|
||||
SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
|
||||
SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
|
||||
MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
|
||||
EOF
|
||||
|
||||
sed \
|
||||
-e "/^\s*unzip\.[ch]/d" \
|
||||
-e "/^\s*ioapi\.[ch]/d" \
|
||||
-i scribus/CMakeLists.txt Scribus.pro || die
|
||||
rm scribus/ioapi.[ch] || die
|
||||
|
||||
sed \
|
||||
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
|
||||
-i resources/templates/CMakeLists.txt || die
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local lang langs
|
||||
for lang in ${IUSE_LINGUAS}; do
|
||||
if use linguas_${lang} || [[ ${lang} == "en" ]]; then
|
||||
# From the CMakeLists.txt
|
||||
# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
|
||||
langs+=";${lang}"
|
||||
else
|
||||
# Don't install localized documentation
|
||||
sed -e "/${lang}/d" -i doc/CMakeLists.txt || die
|
||||
safe_delete file ./resources/dicts/README_${lang}.txt
|
||||
safe_delete file ./resources/dicts/README_hyph_${lang}.txt
|
||||
safe_delete file ./resources/dicts/hyph_${lang}.dic
|
||||
safe_delete file ./resources/loremipsum/${lang}.xml
|
||||
fi
|
||||
done
|
||||
|
||||
local mycmakeargs=(
|
||||
-DHAVE_PYTHON=ON
|
||||
-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
|
||||
-DPYTHON_LIBRARY="$(python_get_library_path)"
|
||||
-DWANT_DISTROBUILD=ON
|
||||
-DDOCDIR="/usr/share/doc/${PF}/"
|
||||
-DWANT_GUI_LANG="${langs#;};en"
|
||||
$(cmake-utils_use_with pdf PODOFO)
|
||||
$(cmake-utils_use_with boost)
|
||||
$(cmake-utils_use_want graphicsmagick)
|
||||
$(cmake-utils_use !osg WANT_NOOSG)
|
||||
$(cmake-utils_use_want debug DEBUG)
|
||||
$(cmake-utils_use_want minimal NOHEADERINSTALL)
|
||||
$(cmake-utils_use_want hunspell HUNSPELL)
|
||||
$(cmake-utils_use_want !examples NOEXAMPLES)
|
||||
$(cmake-utils_use_want !templates NOTEMPLATES)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
local lang
|
||||
for lang in ${IUSE_LINGUAS}; do
|
||||
if ! use linguas_${lang}; then
|
||||
safe_delete dir "${ED}"/usr/share/man/${lang}
|
||||
fi
|
||||
done
|
||||
|
||||
if ! use scripts; then
|
||||
rm "${ED}"/usr/share/scribus/scripts/*.py || die
|
||||
elif ! use tk; then
|
||||
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
|
||||
fi
|
||||
|
||||
use scripts && \
|
||||
python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
|
||||
python_optimize "${ED}"/usr/share/scribus/scripts
|
||||
|
||||
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
|
||||
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
|
||||
cat >> "${T}"/COPYING <<- EOF
|
||||
${PN} is licensed under the "${LICENSE}".
|
||||
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
|
||||
EOF
|
||||
dodoc "${T}"/COPYING
|
||||
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
|
||||
doicon resources/iconsets/1_5_0/scribus.png
|
||||
domenu scribus.desktop
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
}
|
||||
|
||||
safe_delete () {
|
||||
case $1 in
|
||||
dir)
|
||||
if [[ -d "${2}" ]]; then
|
||||
ebegin "Deleting ${2} recursively"
|
||||
rm -r "${2}" || die
|
||||
eend $?
|
||||
fi
|
||||
;;
|
||||
file)
|
||||
if [[ -f "${2}" ]]; then
|
||||
ebegin "Deleting ${2}"
|
||||
rm "${2}" || die
|
||||
eend $?
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
die "Wrong usage"
|
||||
esac
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: library for simplifying indent files"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=678"
|
||||
LICENSE="vim"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
VIM_PLUGIN_HELPTEXT=\
|
||||
"This plugin provides library functions and is not intended to be used
|
||||
directly by the user."
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/templates/wrappers.hs b/templates/wrappers.hs
|
||||
index a1a1a6d..c020cc7 100644
|
||||
--- a/templates/wrappers.hs
|
||||
+++ b/templates/wrappers.hs
|
||||
@@ -284,6 +284,19 @@ runAlex input (Alex f)
|
||||
|
||||
newtype Alex a = Alex { unAlex :: AlexState -> Either String (AlexState, a) }
|
||||
|
||||
+instance Functor Alex where
|
||||
+ fmap f a = Alex $ \s -> case unAlex a s of
|
||||
+ Left msg -> Left msg
|
||||
+ Right (s', a') -> Right (s', f a')
|
||||
+
|
||||
+instance Applicative Alex where
|
||||
+ pure a = Alex $ \s -> Right (s, a)
|
||||
+ fa <*> a = Alex $ \s -> case unAlex fa s of
|
||||
+ Left msg -> Left msg
|
||||
+ Right (s', f) -> case unAlex a s' of
|
||||
+ Left msg -> Left msg
|
||||
+ Right (s'', b) -> Right (s'', f b)
|
||||
+
|
||||
instance Monad Alex where
|
||||
m >>= k = Alex $ \s -> case unAlex m s of
|
||||
Left msg -> Left msg
|
||||
@ -1,116 +0,0 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# OPTIONS_GHC -fno-warn-orphans #-}
|
||||
|
||||
module Main (main) where
|
||||
|
||||
import Test.Framework (Test, defaultMain, testGroup)
|
||||
import Test.Framework.Providers.QuickCheck2 (testProperty)
|
||||
import Test.Framework.Providers.HUnit (testCase)
|
||||
|
||||
import Test.QuickCheck (Arbitrary(..))
|
||||
|
||||
import Control.Monad (liftM)
|
||||
import qualified Data.ByteString.Base64 as Base64
|
||||
import qualified Data.ByteString.Base64.URL as Base64URL
|
||||
import Data.ByteString (ByteString)
|
||||
import Data.ByteString.Char8 ()
|
||||
import qualified Data.ByteString as B
|
||||
import Test.HUnit hiding (Test)
|
||||
|
||||
|
||||
main :: IO ()
|
||||
main = defaultMain tests
|
||||
|
||||
tests :: [Test]
|
||||
tests = [
|
||||
testGroup "Base64" [
|
||||
testProperty "decodeEncode" $
|
||||
genericDecodeEncode Base64.encode Base64.decode
|
||||
, testProperty "decodeEncode Lenient" $
|
||||
genericDecodeEncode Base64.encode
|
||||
(liftM Right Base64.decodeLenient)
|
||||
, testGroup "base64-string tests" base64_string_tests
|
||||
]
|
||||
, testGroup "Base64URL" [
|
||||
testProperty "decodeEncode" $
|
||||
genericDecodeEncode Base64URL.encode Base64URL.decode
|
||||
, testProperty "decodeEncode Lenient" $
|
||||
genericDecodeEncode Base64URL.encode
|
||||
(liftM Right Base64URL.decodeLenient)
|
||||
, testGroup "base64-string tests" base64url_string_tests
|
||||
]
|
||||
]
|
||||
|
||||
instance Arbitrary ByteString where
|
||||
arbitrary = liftM B.pack arbitrary
|
||||
|
||||
-- | Decoding an encoded sintrg should produce the original string.
|
||||
genericDecodeEncode :: (ByteString -> ByteString)
|
||||
-> (ByteString -> Either String ByteString)
|
||||
-> ByteString -> Bool
|
||||
genericDecodeEncode enc dec x = case dec (enc x) of
|
||||
Left _ -> False
|
||||
Right x' -> x == x'
|
||||
|
||||
--
|
||||
-- Unit tests from base64-string
|
||||
-- Copyright (c) Ian Lynagh, 2005, 2007.
|
||||
--
|
||||
|
||||
base64_string_tests :: [Test]
|
||||
base64_string_tests =
|
||||
base64_string_test Base64.encode Base64.decode testData ++
|
||||
base64_string_test Base64.encode decodeURL testData
|
||||
where decodeURL :: ByteString -> Either String ByteString
|
||||
decodeURL = liftM Right Base64.decodeLenient
|
||||
testData :: [(ByteString, ByteString)]
|
||||
testData = [("", "")
|
||||
,("\0", "AA==")
|
||||
,("\255", "/w==")
|
||||
,("E", "RQ==")
|
||||
,("Ex", "RXg=")
|
||||
,("Exa", "RXhh")
|
||||
,("Exam", "RXhhbQ==")
|
||||
,("Examp", "RXhhbXA=")
|
||||
,("Exampl", "RXhhbXBs")
|
||||
,("Example", "RXhhbXBsZQ==")
|
||||
,("Ex\0am\254ple", "RXgAYW3+cGxl")
|
||||
,("Ex\0am\255ple", "RXgAYW3/cGxl")
|
||||
]
|
||||
|
||||
-- | Same as the base64_string_tests but using the alternative alphabet
|
||||
base64url_string_tests :: [Test]
|
||||
base64url_string_tests =
|
||||
base64_string_test Base64URL.encode Base64URL.decode testData ++
|
||||
base64_string_test Base64URL.encode decodeURL testData
|
||||
where decodeURL :: ByteString -> Either String ByteString
|
||||
decodeURL = liftM Right Base64URL.decodeLenient
|
||||
testData :: [(ByteString, ByteString)]
|
||||
testData = [("", "")
|
||||
,("\0", "AA==")
|
||||
,("\255", "_w==")
|
||||
,("E", "RQ==")
|
||||
,("Ex", "RXg=")
|
||||
,("Exa", "RXhh")
|
||||
,("Exam", "RXhhbQ==")
|
||||
,("Examp", "RXhhbXA=")
|
||||
,("Exampl", "RXhhbXBs")
|
||||
,("Example", "RXhhbXBsZQ==")
|
||||
,("Ex\0am\254ple", "RXgAYW3-cGxl")
|
||||
,("Ex\0am\255ple", "RXgAYW3_cGxl")
|
||||
]
|
||||
|
||||
-- | Generic test given encod enad decode funstions and a
|
||||
-- list of (plain, encoded) pairs
|
||||
base64_string_test :: (ByteString -> ByteString)
|
||||
-> (ByteString -> Either String ByteString)
|
||||
-> [(ByteString, ByteString)] -> [Test]
|
||||
base64_string_test enc dec testData = concat
|
||||
[ [ testCase ("base64-string: Encode " ++ show plain)
|
||||
(encoded_plain @?= encoded),
|
||||
testCase ("base64-string: Decode " ++ show plain)
|
||||
(decoded_encoded @?= Right plain) ]
|
||||
| (plain, encoded) <- testData,
|
||||
let encoded_plain = enc plain
|
||||
decoded_encoded = dec encoded
|
||||
]
|
||||
@ -1,45 +0,0 @@
|
||||
--- c2hs-0.16.3-orig/src/C2HS/Config.hs 2011-03-25 00:04:59.000000000 +1100
|
||||
+++ c2hs-0.16.3/src/C2HS/Config.hs 2012-09-16 10:57:54.514595408 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-- -*-haskell-*-
|
||||
-- ** @configure_input@ **
|
||||
-- ===========================================================================
|
||||
@@ -38,6 +39,10 @@
|
||||
|
||||
import Foreign (toBool)
|
||||
import Foreign.C (CInt)
|
||||
+#if (__GLASGOW_HASKELL__>=705)
|
||||
+import Foreign.C.Types(CInt(..))
|
||||
+#endif
|
||||
+
|
||||
import System.Info (arch, os)
|
||||
|
||||
-- program settings
|
||||
--- c2hs-0.16.3-orig/src/Control/StateTrans.hs 2011-03-25 00:04:59.000000000 +1100
|
||||
+++ c2hs-0.16.3/src/Control/StateTrans.hs 2012-09-16 10:56:52.470863551 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
|
||||
-- The HiPar Toolkit: state transformer routines
|
||||
--
|
||||
-- Author : Manuel M. T. Chakravarty
|
||||
@@ -73,6 +74,10 @@
|
||||
throwExc, fatal, catchExc, fatalsHandledBy)
|
||||
where
|
||||
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
+import Prelude hiding (catch)
|
||||
+#endif
|
||||
+import Control.Exception (catch, IOException)
|
||||
|
||||
-- BEWARE! You enter monad country. Read any of Wadler's or
|
||||
-- Launchbury/Peyton-Jones' texts before entering. Otherwise,
|
||||
@@ -296,7 +301,7 @@
|
||||
ioError err
|
||||
Right _a -> return state
|
||||
)
|
||||
- `catch` (\err -> let
|
||||
+ `catch` (\(err :: IOException) -> let
|
||||
STB handler' = handler err
|
||||
in
|
||||
handler' bs gs)
|
||||
@ -1,19 +0,0 @@
|
||||
Fix include path on cabal-1.14
|
||||
|
||||
Building cairo-0.12.3...
|
||||
Preprocessing library cairo-0.12.3...
|
||||
dist/build/Graphics/Rendering/Cairo/Matrix.h:1:26: fatal error: cairo-gtk2hs.h: No such file or directory
|
||||
compilation terminated.
|
||||
gtk2hsC2hs: Error during preprocessing custom header file
|
||||
diff --git a/cairo.cabal b/cairo.cabal
|
||||
index af7cee9..62fe84b 100644
|
||||
--- a/cairo.cabal
|
||||
+++ b/cairo.cabal
|
||||
@@ -69,6 +69,7 @@ Library
|
||||
Graphics.Rendering.Cairo.Internal.Surfaces.PS
|
||||
Graphics.Rendering.Cairo.Internal.Surfaces.SVG
|
||||
extensions: ForeignFunctionInterface
|
||||
+ Include-dirs: .
|
||||
x-c2hs-Header: cairo-gtk2hs.h
|
||||
pkgconfig-depends: cairo >= 1.2.0
|
||||
if flag(cairo_pdf)
|
||||
@ -1,90 +0,0 @@
|
||||
diff --git a/Network/CGI/Protocol.hs b/Network/CGI/Protocol.hs
|
||||
index 6b9d2ec..e9a14ff 100644
|
||||
--- a/Network/CGI/Protocol.hs
|
||||
+++ b/Network/CGI/Protocol.hs
|
||||
@@ -11,7 +11,7 @@
|
||||
-- An implementation of the program side of the CGI protocol.
|
||||
--
|
||||
-----------------------------------------------------------------------------
|
||||
-
|
||||
+{-# LANGUAGE CPP, DeriveDataTypeable #-}
|
||||
module Network.CGI.Protocol (
|
||||
-- * CGI request
|
||||
CGIRequest(..), Input(..),
|
||||
@@ -44,7 +44,12 @@ import System.IO (Handle, hPutStrLn, stderr, hFlush, hSetBinaryMode)
|
||||
import qualified Data.ByteString.Lazy.Char8 as BS
|
||||
import Data.ByteString.Lazy.Char8 (ByteString)
|
||||
|
||||
+#if MIN_VERSION_base(4,7,0)
|
||||
+import Data.Typeable
|
||||
+#else
|
||||
import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
|
||||
+#endif
|
||||
+
|
||||
|
||||
import Network.CGI.Header
|
||||
import Network.CGI.Multipart
|
||||
@@ -72,8 +77,10 @@ data CGIRequest =
|
||||
}
|
||||
deriving (Show)
|
||||
|
||||
+#if ! MIN_VERSION_base(4,7,0)
|
||||
instance Typeable CGIResult where
|
||||
typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Protocol.CGIResult") []
|
||||
+#endif
|
||||
|
||||
-- | The value of an input parameter, and some metadata.
|
||||
data Input = Input {
|
||||
@@ -90,7 +97,11 @@ data Input = Input {
|
||||
-- | The result of a CGI program.
|
||||
data CGIResult = CGIOutput ByteString
|
||||
| CGINothing
|
||||
+#if MIN_VERSION_base(4,7,0)
|
||||
+ deriving (Show, Read, Eq, Ord, Typeable)
|
||||
+#else
|
||||
deriving (Show, Read, Eq, Ord)
|
||||
+#endif
|
||||
|
||||
--
|
||||
-- * Running CGI actions
|
||||
|
||||
|
||||
diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs
|
||||
index 2294f8c..7ed116c 100644
|
||||
--- a/Network/CGI/Monad.hs
|
||||
+++ b/Network/CGI/Monad.hs
|
||||
@@ -1,4 +1,5 @@
|
||||
{-# OPTIONS_GHC -fglasgow-exts #-}
|
||||
+{-# LANGUAGE CPP, DeriveDataTypeable #-}
|
||||
-----------------------------------------------------------------------------
|
||||
-- |
|
||||
-- Module : Network.CGI.Monad
|
||||
@@ -40,8 +41,12 @@ import Control.Monad.Error (MonadError(..))
|
||||
import Control.Monad.Reader (ReaderT(..), asks)
|
||||
import Control.Monad.Writer (WriterT(..), tell)
|
||||
import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
|
||||
+#if MIN_VERSION_base(4,7,0)
|
||||
+import Data.Typeable
|
||||
+#else
|
||||
import Data.Typeable (Typeable(..), Typeable1(..),
|
||||
- mkTyConApp, mkTyCon)
|
||||
+ mkTyConApp, mkTyCon)
|
||||
+#endif
|
||||
|
||||
import Network.CGI.Protocol
|
||||
|
||||
@@ -55,10 +60,14 @@ type CGI a = CGIT IO a
|
||||
|
||||
-- | The CGIT monad transformer.
|
||||
newtype CGIT m a = CGIT { unCGIT :: ReaderT CGIRequest (WriterT Headers m) a }
|
||||
+#if MIN_VERSION_base(4,7,0)
|
||||
+ deriving (Typeable)
|
||||
|
||||
+#else
|
||||
instance (Typeable1 m, Typeable a) => Typeable (CGIT m a) where
|
||||
typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Monad.CGIT")
|
||||
[typeOf1 (undefined :: m a), typeOf (undefined :: a)]
|
||||
+#endif
|
||||
|
||||
instance (Functor m, Monad m) => Functor (CGIT m) where
|
||||
fmap f c = CGIT (fmap f (unCGIT c))
|
||||
@ -1,10 +0,0 @@
|
||||
diff --git a/test/doctests.hs b/test/doctests.hs
|
||||
index 3862bd3..943da13 100644
|
||||
--- a/test/doctests.hs
|
||||
+++ b/test/doctests.hs
|
||||
@@ -3,4 +3,4 @@ module Main where
|
||||
import Test.DocTest
|
||||
|
||||
main :: IO ()
|
||||
-main = doctest ["Data/Conduit.hs"]
|
||||
+main = doctest $ ["Data/Conduit.hs", "-hide-all-packages"] ++ (map ("-package "++) ["base","resourcet","lifted-base","transformers-base","monad-control","containers","transformers","mtl","bytestring","text","void","mmorph","directory"])
|
||||
@ -1,11 +0,0 @@
|
||||
--- contravariant-1.3-orig/src/Data/Functor/Contravariant/Compose.hs 2015-03-10 04:41:19.000000000 +1100
|
||||
+++ contravariant-1.3/src/Data/Functor/Contravariant/Compose.hs 2015-03-11 21:55:46.287717619 +1100
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#if __GLASGOW_HASKELL__ < 710
|
||||
import Control.Applicative
|
||||
+#else
|
||||
+import Control.Applicative ((<$>))
|
||||
#endif
|
||||
|
||||
import Data.Functor.Contravariant
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/convertible.cabal b/convertible.cabal
|
||||
index 377562d..98b7cc7 100644
|
||||
--- a/convertible.cabal
|
||||
+++ b/convertible.cabal
|
||||
@@ -50,7 +50,7 @@ flag time_gte_113
|
||||
|
||||
library
|
||||
if flag(splitBase)
|
||||
- Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && <=1.2.0.3,
|
||||
+ Build-Depends: base>=3 && <5, old-time, time>=1.1.2.4 && < 1.3,
|
||||
bytestring, containers, old-locale
|
||||
if flag(time_gte_113)
|
||||
Build-Depends: time>=1.1.3
|
||||
@ -1,31 +0,0 @@
|
||||
--- DAV-1.0.3-orig/hdav.hs 2014-10-15 03:15:28.000000000 +1100
|
||||
+++ DAV-1.0.3/hdav.hs 2015-04-05 14:41:10.869833370 +1000
|
||||
@@ -16,6 +16,8 @@
|
||||
-- You should have received a copy of the GNU General Public License
|
||||
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
+{-# LANGUAGE FlexibleContexts #-}
|
||||
+
|
||||
import qualified Data.ByteString.Char8 as BC8
|
||||
|
||||
import Paths_DAV (version)
|
||||
--- DAV-1.0.3-orig/Network/Protocol/HTTP/DAV.hs 2014-10-15 03:15:28.000000000 +1100
|
||||
+++ DAV-1.0.3/Network/Protocol/HTTP/DAV.hs 2015-04-05 14:40:00.119911047 +1000
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
import Network.Protocol.HTTP.DAV.TH
|
||||
|
||||
-import Control.Applicative (liftA2, Applicative)
|
||||
+import Control.Applicative (liftA2, Alternative, Applicative)
|
||||
import Control.Error (EitherT(..))
|
||||
import Control.Lens ((^.), (.=), (%=), (.~))
|
||||
import Control.Monad (when, MonadPlus)
|
||||
@@ -89,7 +89,7 @@
|
||||
def = DAVContext [] def B.empty B.empty [] Nothing def Nothing "hDav-using application"
|
||||
|
||||
newtype DAVT m a = DAVT { runDAVT :: EitherT String (StateT DAVContext m) a }
|
||||
- deriving (Applicative, Functor, Monad, MonadBase b, MonadError String, MonadFix, MonadIO, MonadPlus, MonadState DAVContext)
|
||||
+ deriving (Alternative, Applicative, Functor, Monad, MonadBase b, MonadError String, MonadFix, MonadIO, MonadPlus, MonadState DAVContext)
|
||||
|
||||
-- this orphan instance is probably a bad idea
|
||||
instance MonadMask m => MonadMask (EitherT e m) where
|
||||
@ -1,17 +0,0 @@
|
||||
--- gio-0.12.3-orig/System/GIO/Async/AsyncResult.chs 2012-03-09 10:32:58.000000000 +1100
|
||||
+++ gio-0.12.3/System/GIO/Async/AsyncResult.chs 2012-10-11 10:04:03.686864483 +1100
|
||||
@@ -47,12 +47,12 @@
|
||||
{#pointer GAsyncReadyCallback#}
|
||||
|
||||
foreign import ccall "wrapper" mkAsyncReadyCallback ::
|
||||
- (Ptr GObject -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback
|
||||
+ (Ptr () -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback
|
||||
|
||||
marshalAsyncReadyCallback :: AsyncReadyCallback -> IO GAsyncReadyCallback
|
||||
marshalAsyncReadyCallback asyncReadyCallback =
|
||||
mkAsyncReadyCallback $ \ cObject cAsyncResult cCallback -> do
|
||||
- object <- (makeNewGObject mkGObject . return) cObject
|
||||
+ object <- (makeNewGObject mkGObject . return) (castPtr cObject)
|
||||
asyncResult <- (makeNewGObject mkAsyncResult . return) cAsyncResult
|
||||
asyncReadyCallback object asyncResult
|
||||
freeHaskellFunPtr (castPtrToFunPtr cCallback)
|
||||
@ -1,11 +0,0 @@
|
||||
--- gio-0.13.0.4-orig/SetupWrapper.hs 2014-12-24 21:02:08.000000000 +1100
|
||||
+++ gio-0.13.0.4/SetupWrapper.hs 2015-01-03 19:14:53.721416960 +1100
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
import System.Environment
|
||||
import System.Process
|
||||
-import System.Exit
|
||||
+import System.Exit (exitWith, ExitCode(..))
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import qualified Control.Exception as Exception
|
||||
@ -1,31 +0,0 @@
|
||||
--- glib-0.12.3.1-orig/System/Glib/GObject.chs 2012-05-28 08:18:53.000000000 +1000
|
||||
+++ glib-0.12.3.1/System/Glib/GObject.chs 2012-10-11 09:48:16.313701201 +1100
|
||||
@@ -127,8 +127,6 @@
|
||||
|
||||
{#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
|
||||
--- glib-0.12.3.1-orig/System/Glib/MainLoop.chs 2012-05-28 08:18:53.000000000 +1000
|
||||
+++ glib-0.12.3.1/System/Glib/MainLoop.chs 2012-10-11 09:48:04.779383615 +1100
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
{#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 @@
|
||||
--
|
||||
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,11 +0,0 @@
|
||||
--- glib-0.13.0.7-orig/SetupWrapper.hs 2014-12-24 20:57:16.000000000 +1100
|
||||
+++ glib-0.13.0.7/SetupWrapper.hs 2015-01-03 17:39:42.464000600 +1100
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
import System.Environment
|
||||
import System.Process
|
||||
-import System.Exit
|
||||
+import System.Exit (exitWith, ExitCode(..))
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import qualified Control.Exception as Exception
|
||||
@ -1,23 +0,0 @@
|
||||
diff --git a/Graphics/UI/Gtk/General/Structs.hsc b/Graphics/UI/Gtk/General/Structs.hsc
|
||||
index 2df0385..c1b8452 100644
|
||||
--- a/Graphics/UI/Gtk/General/Structs.hsc
|
||||
+++ b/Graphics/UI/Gtk/General/Structs.hsc
|
||||
@@ -1,4 +1,5 @@
|
||||
{-# LANGUAGE ScopedTypeVariables, TypeSynonymInstances #-}
|
||||
+{-# LANGUAGE FlexibleInstances #-}
|
||||
{-# OPTIONS_HADDOCK hide #-}
|
||||
-- -*-haskell-*-
|
||||
|
||||
diff --git a/gtk.cabal b/gtk.cabal
|
||||
index bd97975..aa7165f 100644
|
||||
--- a/gtk.cabal
|
||||
+++ b/gtk.cabal
|
||||
@@ -126,7 +126,7 @@ Flag have-gio
|
||||
|
||||
Library
|
||||
build-depends: base >= 4 && < 5,
|
||||
- array, containers, haskell98, mtl, bytestring,
|
||||
+ array, containers, mtl, bytestring,
|
||||
glib >= 0.12.0 && < 0.13,
|
||||
pango >= 0.12.0 && < 0.13,
|
||||
cairo >= 0.12.0 && < 0.13
|
||||
@ -1,18 +0,0 @@
|
||||
fix build failure against recent glib-2.32
|
||||
|
||||
In file included from Graphics/UI/Gtk/General/hsgthread.c:29:0:
|
||||
|
||||
/usr/include/glib-2.0/glib/gthread.h:28:2:
|
||||
ошибка: #error "Only <glib.h> can be included directly."
|
||||
diff --git a/Graphics/UI/Gtk/General/hsgthread.c b/Graphics/UI/Gtk/General/hsgthread.c
|
||||
index 5eaed46..6d20e73 100644
|
||||
--- a/Graphics/UI/Gtk/General/hsgthread.c
|
||||
+++ b/Graphics/UI/Gtk/General/hsgthread.c
|
||||
@@ -26,7 +26,6 @@
|
||||
*/
|
||||
|
||||
#include <glib.h>
|
||||
-#include <glib/gthread.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include "hsgthread.h"
|
||||
|
||||
@ -1,287 +0,0 @@
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-11 12:51:38.040935853 +1100
|
||||
@@ -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
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-11 12:50:59.510893025 +1100
|
||||
@@ -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
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-11 12:50:02.711356413 +1100
|
||||
@@ -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.
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-11 12:49:22.402264615 +1100
|
||||
@@ -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.
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-11 12:47:30.867237897 +1100
|
||||
@@ -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
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-11 12:47:06.478576590 +1100
|
||||
@@ -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)
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-11 12:46:41.970912216 +1100
|
||||
@@ -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.
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-11 12:45:41.325267512 +1100
|
||||
@@ -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
|
||||
--- gtk-0.12.3.1-orig/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 07:39:34.000000000 +1000
|
||||
+++ gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-11 12:40:38.320051642 +1100
|
||||
@@ -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
|
||||
@ -1,20 +0,0 @@
|
||||
--- gtk-0.13.4-orig/SetupWrapper.hs 2014-12-24 22:16:46.000000000 +1100
|
||||
+++ gtk-0.13.4/SetupWrapper.hs 2015-03-10 22:00:39.902873712 +1100
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
import System.Environment
|
||||
import System.Process
|
||||
-import System.Exit
|
||||
+import System.Exit (ExitCode(..), exitWith)
|
||||
import System.FilePath
|
||||
import System.Directory
|
||||
import qualified Control.Exception as Exception
|
||||
--- gtk-0.13.4-orig/Graphics/UI/Gtk/Gdk/EventM.hsc 2014-12-24 22:16:46.000000000 +1100
|
||||
+++ gtk-0.13.4/Graphics/UI/Gtk/Gdk/EventM.hsc 2015-03-10 21:44:29.022453643 +1100
|
||||
@@ -1,5 +1,6 @@
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
{-# LANGUAGE EmptyDataDecls #-}
|
||||
+{-# LANGUAGE FlexibleContexts #-}
|
||||
-- -*-haskell-*-
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/haddock.cabal b/haddock.cabal
|
||||
index 2f36187..0c2aeb4 100644
|
||||
--- a/haddock.cabal
|
||||
+++ b/haddock.cabal
|
||||
@@ -142,7 +142,7 @@ library
|
||||
containers,
|
||||
array,
|
||||
xhtml >= 3000.2 && < 3000.3,
|
||||
- Cabal >= 1.10,
|
||||
+ Cabal >= 1.10 && < 1.14,
|
||||
ghc >= 7.0 && < 7.2
|
||||
|
||||
if flag(in-ghc-tree)
|
||||
@ -1,58 +0,0 @@
|
||||
--- happstack-server-7.4.2-orig/src/Happstack/Server/Internal/Monads.hs 2015-03-24 03:34:11.000000000 +1100
|
||||
+++ happstack-server-7.4.2/src/Happstack/Server/Internal/Monads.hs 2015-04-04 15:20:58.273008986 +1100
|
||||
@@ -173,7 +173,7 @@
|
||||
instance MonadTrans (ServerPartT) where
|
||||
lift m = withRequest (\_ -> lift m)
|
||||
|
||||
-instance (Monad m) => Monoid (ServerPartT m a) where
|
||||
+instance (Monad m, MonadPlus m) => Monoid (ServerPartT m a) where
|
||||
mempty = mzero
|
||||
mappend = mplus
|
||||
|
||||
@@ -486,7 +486,7 @@
|
||||
instance MonadTrans WebT where
|
||||
lift = WebT . lift . lift . lift
|
||||
|
||||
-instance (Monad m) => MonadPlus (WebT m) where
|
||||
+instance (Monad m, MonadPlus m) => MonadPlus (WebT m) where
|
||||
-- | Aborts a computation.
|
||||
--
|
||||
-- This is primarily useful because 'msum' will take an array of
|
||||
@@ -505,7 +505,7 @@
|
||||
lft (Left r, _) = Left r
|
||||
lft (Right a, f) = Right (a, f)
|
||||
|
||||
-instance (Monad m) => Monoid (WebT m a) where
|
||||
+instance (Monad m, MonadPlus m) => Monoid (WebT m a) where
|
||||
mempty = mzero
|
||||
mappend = mplus
|
||||
|
||||
@@ -561,7 +561,7 @@
|
||||
liftWebT (Just (Right x,f)) = pass (return x)>>= (\a -> return $ Just (Right a,f))
|
||||
|
||||
-- | Deprecated: use 'msum'.
|
||||
-multi :: Monad m => [ServerPartT m a] -> ServerPartT m a
|
||||
+multi :: (Monad m, MonadPlus m) => [ServerPartT m a] -> ServerPartT m a
|
||||
multi = msum
|
||||
{-# DEPRECATED multi "Use msum instead" #-}
|
||||
|
||||
--- happstack-server-7.4.2-orig/src/Happstack/Server/RqData.hs 2015-03-24 03:34:11.000000000 +1100
|
||||
+++ happstack-server-7.4.2/src/Happstack/Server/RqData.hs 2015-04-04 15:25:15.454830906 +1100
|
||||
@@ -92,7 +92,7 @@
|
||||
newtype ReaderError r e a = ReaderError { unReaderError :: ReaderT r (Either e) a }
|
||||
deriving (Functor, Monad, MonadPlus)
|
||||
|
||||
-instance (Error e) => MonadReader r (ReaderError r e) where
|
||||
+instance (Error e, Monoid e) => MonadReader r (ReaderError r e) where
|
||||
ask = ReaderError ask
|
||||
local f m = ReaderError $ local f (unReaderError m)
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
rqDataError e = mapRqData ((Left e) `apEither`) (return ())
|
||||
|
||||
-- instance (MonadPlus m, MonadIO m, ServerMonad m) => (HasRqData m) where
|
||||
-instance (MonadIO m) => HasRqData (ServerPartT m) where
|
||||
+instance (MonadIO m, MonadPlus m) => HasRqData (ServerPartT m) where
|
||||
askRqEnv =
|
||||
do rq <- askRq
|
||||
mbi <- liftIO $ if ((rqMethod rq == POST) || (rqMethod rq == PUT)) && (isDecodable (ctype rq))
|
||||
@ -1,225 +0,0 @@
|
||||
commit 65b7c1c907cc7a60b088ff8de43edd1e1f1d5165
|
||||
Author: Tenor Biel <tenorbiel@gmail.com>
|
||||
Date: Mon Mar 30 02:46:58 2015 -0500
|
||||
|
||||
add version handlers for time-1.5.* and time-1.4.*
|
||||
|
||||
diff --git a/src/Happstack/Server/FileServe/BuildingBlocks.hs b/src/Happstack/Server/FileServe/BuildingBlocks.hs
|
||||
index eda3727..9650305 100644
|
||||
--- a/src/Happstack/Server/FileServe/BuildingBlocks.hs
|
||||
+++ b/src/Happstack/Server/FileServe/BuildingBlocks.hs
|
||||
@@ -65,7 +65,6 @@ import Data.List (sort)
|
||||
import Data.Maybe (fromMaybe)
|
||||
import Data.Map (Map)
|
||||
import qualified Data.Map as Map
|
||||
-import Data.Time (UTCTime, formatTime)
|
||||
import Data.Time.Compat (toUTCTime)
|
||||
import Filesystem.Path.CurrentOS (commonPrefix, encodeString, decodeString, collapse, append)
|
||||
import Happstack.Server.Monads (ServerMonad(askRq), FilterMonad, WebMonad)
|
||||
@@ -74,12 +73,18 @@ import Happstack.Server.Types (Length(ContentLength), Request(rqPaths, rqU
|
||||
import System.Directory (doesDirectoryExist, doesFileExist, getDirectoryContents, getModificationTime)
|
||||
import System.FilePath ((</>), addTrailingPathSeparator, hasDrive, isPathSeparator, joinPath, takeExtension, isValid)
|
||||
import System.IO (IOMode(ReadMode), hFileSize, hClose, openBinaryFile, withBinaryFile)
|
||||
-import System.Locale (defaultTimeLocale)
|
||||
import System.Log.Logger (Priority(DEBUG), logM)
|
||||
import Text.Blaze.Html ((!))
|
||||
import qualified Text.Blaze.Html5 as H
|
||||
import qualified Text.Blaze.Html5.Attributes as A
|
||||
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+import Data.Time (UTCTime, formatTime, defaultTimeLocale)
|
||||
+#else
|
||||
+import System.Locale (defaultTimeLocale)
|
||||
+import Data.Time (UTCTime, formatTime)
|
||||
+#endif
|
||||
+
|
||||
-- * Mime-Type / Content-Type
|
||||
|
||||
-- |a 'Map' from file extensions to content-types
|
||||
diff --git a/src/Happstack/Server/Internal/Clock.hs b/src/Happstack/Server/Internal/Clock.hs
|
||||
index 6a16b9b..7d58877 100644
|
||||
--- a/src/Happstack/Server/Internal/Clock.hs
|
||||
+++ b/src/Happstack/Server/Internal/Clock.hs
|
||||
@@ -12,9 +12,14 @@ import Control.Monad
|
||||
import Data.IORef
|
||||
import Data.Time.Clock (UTCTime)
|
||||
import Data.Time.Clock.POSIX (POSIXTime, getPOSIXTime, posixSecondsToUTCTime)
|
||||
-import Data.Time.Format (formatTime)
|
||||
import System.IO.Unsafe
|
||||
-import System.Locale
|
||||
+
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+import Data.Time.Format (formatTime, defaultTimeLocale)
|
||||
+#else
|
||||
+import Data.Time.Format (formatTime)
|
||||
+import System.Locale (defaultTimeLocale)
|
||||
+#endif
|
||||
|
||||
import qualified Data.ByteString.Char8 as B
|
||||
|
||||
@@ -57,4 +62,4 @@ getApproximatePOSIXTime :: IO POSIXTime
|
||||
getApproximatePOSIXTime = readIORef (cachedPOSIXTime clock)
|
||||
|
||||
getApproximateUTCTime :: IO UTCTime
|
||||
-getApproximateUTCTime = posixSecondsToUTCTime <$> getApproximatePOSIXTime
|
||||
\ No newline at end of file
|
||||
+getApproximateUTCTime = posixSecondsToUTCTime <$> getApproximatePOSIXTime
|
||||
diff --git a/src/Happstack/Server/Internal/Cookie.hs b/src/Happstack/Server/Internal/Cookie.hs
|
||||
index b65edbd..ea76345 100644
|
||||
--- a/src/Happstack/Server/Internal/Cookie.hs
|
||||
+++ b/src/Happstack/Server/Internal/Cookie.hs
|
||||
@@ -23,10 +23,15 @@ import Data.Data (Data, Typeable)
|
||||
import Data.List ((\\), intersperse)
|
||||
import Data.Time.Clock (UTCTime, addUTCTime, diffUTCTime)
|
||||
import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
|
||||
-import Data.Time.Format (formatTime)
|
||||
import Happstack.Server.Internal.Clock (getApproximateUTCTime)
|
||||
import Text.ParserCombinators.Parsec hiding (token)
|
||||
-import System.Locale (defaultTimeLocale)
|
||||
+
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+import Data.Time.Format (formatTime, defaultTimeLocale)
|
||||
+#else
|
||||
+import Data.Time.Format (formatTime)
|
||||
+import System.Locale (defaultTimeLocale)
|
||||
+#endif
|
||||
|
||||
-- | a type for HTTP cookies. Usually created using 'mkCookie'.
|
||||
data Cookie = Cookie
|
||||
diff --git a/src/Happstack/Server/Internal/LogFormat.hs b/src/Happstack/Server/Internal/LogFormat.hs
|
||||
index 5561940..c85ff81 100644
|
||||
--- a/src/Happstack/Server/Internal/LogFormat.hs
|
||||
+++ b/src/Happstack/Server/Internal/LogFormat.hs
|
||||
@@ -3,8 +3,12 @@ module Happstack.Server.Internal.LogFormat
|
||||
, formatRequestCombined
|
||||
) where
|
||||
|
||||
-import System.Locale (defaultTimeLocale)
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+import Data.Time.Format (FormatTime(..), formatTime, defaultTimeLocale)
|
||||
+#else
|
||||
import Data.Time.Format (FormatTime(..), formatTime)
|
||||
+import System.Locale (defaultTimeLocale)
|
||||
+#endif
|
||||
|
||||
-- | Format the time as describe in the Apache combined log format.
|
||||
-- https://httpd.apache.org/docs/2.2/logs.html#combined
|
||||
diff --git a/src/Happstack/Server/Response.hs b/src/Happstack/Server/Response.hs
|
||||
index 7ae52b3..23f61b0 100644
|
||||
--- a/src/Happstack/Server/Response.hs
|
||||
+++ b/src/Happstack/Server/Response.hs
|
||||
@@ -1,6 +1,6 @@
|
||||
{-# LANGUAGE FlexibleContexts, FlexibleInstances, TypeSynonymInstances, ScopedTypeVariables #-}
|
||||
-- | Functions and classes related to generating a 'Response' and setting the response code. For detailed instruction see the Happstack Crash Course: <http://happstack.com/docs/crashcourse/HelloWorld.html#response_code>
|
||||
-module Happstack.Server.Response
|
||||
+module Happstack.Server.Response
|
||||
( -- * Converting values to a 'Response'
|
||||
ToMessage(..)
|
||||
, flatten
|
||||
@@ -34,24 +34,29 @@ import qualified Data.Text as T
|
||||
import qualified Data.Text.Encoding as T
|
||||
import qualified Data.Text.Lazy as LT
|
||||
import qualified Data.Text.Lazy.Encoding as LT
|
||||
-import Data.Time (UTCTime, formatTime)
|
||||
import Happstack.Server.Internal.Monads (FilterMonad(composeFilter))
|
||||
import Happstack.Server.Types (Response(..), Request(..), nullRsFlags, getHeader, noContentLength, redirect, result, setHeader, setHeaderBS)
|
||||
import Happstack.Server.SURI (ToSURI)
|
||||
-import System.Locale (defaultTimeLocale)
|
||||
import qualified Text.Blaze.Html as Blaze
|
||||
import qualified Text.Blaze.Html.Renderer.Utf8 as Blaze
|
||||
import Text.Html (Html, renderHtml)
|
||||
import qualified Text.XHtml as XHtml (Html, renderHtml)
|
||||
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+import Data.Time (UTCTime, formatTime, defaultTimeLocale)
|
||||
+#else
|
||||
+import Data.Time (UTCTime, formatTime)
|
||||
+import System.Locale (defaultTimeLocale)
|
||||
+#endif
|
||||
+
|
||||
-- | A low-level function to build a 'Response' from a content-type
|
||||
-- and a 'ByteString'.
|
||||
--
|
||||
-- Creates a 'Response' in a manner similar to the 'ToMessage' class,
|
||||
-- but without requiring an instance declaration.
|
||||
---
|
||||
+--
|
||||
-- example:
|
||||
---
|
||||
+--
|
||||
-- > import Data.ByteString.Char8 as C
|
||||
-- > import Data.ByteString.Lazy.Char8 as L
|
||||
-- > import Happstack.Server
|
||||
@@ -85,7 +90,7 @@ toResponseBS contentType message =
|
||||
--
|
||||
-- > main = serve Nothing $ toResponse "hello, world!"
|
||||
--
|
||||
--- Minimal definition: 'toMessage' (and usually 'toContentType').
|
||||
+-- Minimal definition: 'toMessage' (and usually 'toContentType').
|
||||
class ToMessage a where
|
||||
toContentType :: a -> B.ByteString
|
||||
toContentType _ = B.pack "text/plain"
|
||||
@@ -194,31 +199,31 @@ modifyResponse = composeFilter
|
||||
--
|
||||
-- A filter for setting the response code. Generally you will use a
|
||||
-- helper function like 'ok' or 'seeOther'.
|
||||
---
|
||||
+--
|
||||
-- > main = simpleHTTP nullConf $ do setResponseCode 200
|
||||
-- > return "Everything is OK"
|
||||
---
|
||||
+--
|
||||
-- see also: 'resp'
|
||||
-setResponseCode :: FilterMonad Response m =>
|
||||
+setResponseCode :: FilterMonad Response m =>
|
||||
Int -- ^ response code
|
||||
-> m ()
|
||||
setResponseCode code
|
||||
= composeFilter $ \r -> r{rsCode = code}
|
||||
|
||||
-- | Same as @'setResponseCode' status >> return val@.
|
||||
---
|
||||
+--
|
||||
-- Use this if you want to set a response code that does not already
|
||||
--- have a helper function.
|
||||
---
|
||||
+-- have a helper function.
|
||||
+--
|
||||
-- > main = simpleHTTP nullConf $ resp 200 "Everything is OK"
|
||||
-resp :: (FilterMonad Response m) =>
|
||||
+resp :: (FilterMonad Response m) =>
|
||||
Int -- ^ response code
|
||||
-> b -- ^ value to return
|
||||
-> m b
|
||||
resp status val = setResponseCode status >> return val
|
||||
|
||||
-- | Respond with @200 OK@.
|
||||
---
|
||||
+--
|
||||
-- > main = simpleHTTP nullConf $ ok "Everything is OK"
|
||||
ok :: (FilterMonad Response m) => a -> m a
|
||||
ok = resp 200
|
||||
@@ -239,7 +244,7 @@ movedPermanently uri res = do modifyResponse $ redirect 301 uri
|
||||
return res
|
||||
|
||||
-- | Respond with @302 Found@.
|
||||
---
|
||||
+--
|
||||
-- You probably want 'seeOther'. This method is not in popular use anymore, and is generally treated like 303 by most user-agents anyway.
|
||||
found :: (FilterMonad Response m, ToSURI uri) => uri -> res -> m res
|
||||
found uri res = do modifyResponse $ redirect 302 uri
|
||||
@@ -284,7 +289,7 @@ forbidden :: (FilterMonad Response m) => a -> m a
|
||||
forbidden = resp 403
|
||||
|
||||
-- | Respond with @404 Not Found@.
|
||||
---
|
||||
+--
|
||||
-- > main = simpleHTTP nullConf $ notFound "What you are looking for has not been found."
|
||||
notFound :: (FilterMonad Response m) => a -> m a
|
||||
notFound = resp 404
|
||||
@@ -324,4 +329,4 @@ prettyResponse res@SendFile{} =
|
||||
showString "\nrsValidator = " . shows (rsValidator res).
|
||||
showString "\nsfFilePath = " . shows (sfFilePath res) .
|
||||
showString "\nsfOffset = " . shows (sfOffset res) .
|
||||
- showString "\nsfCount = " $ show (sfCount res)
|
||||
+ showString "\nsfCount = " $ show (sfCount res)
|
||||
@ -1,12 +0,0 @@
|
||||
Tue Aug 2 12:16:38 EEST 2011 Sergei Trofimovich <slyfox@community.haskell.org>
|
||||
* doc: make happy.1 be buildabale with doc/configure
|
||||
diff -rN -u old-happy/doc/configure.ac new-happy/doc/configure.ac
|
||||
--- old-happy/doc/configure.ac 2011-08-02 12:24:20.913926740 +0300
|
||||
+++ new-happy/doc/configure.ac 2011-08-02 12:24:20.923926615 +0300
|
||||
@@ -9,5 +9,5 @@
|
||||
|
||||
AC_PATH_PROG(DbLatexCmd,dblatex)
|
||||
|
||||
-AC_CONFIG_FILES([config.mk])
|
||||
+AC_CONFIG_FILES([config.mk happy.1])
|
||||
AC_OUTPUT
|
||||
@ -1,260 +0,0 @@
|
||||
--- happy-1.18.9-orig/happy.cabal 2012-02-06 20:49:56.000000000 +1100
|
||||
+++ happy-1.18.9/happy.cabal 2012-02-07 20:50:33.859004968 +1100
|
||||
@@ -100,10 +100,13 @@
|
||||
templates/GLR_Base.hs
|
||||
templates/GenericTemplate.hs
|
||||
templates/GLR_Lib.hs
|
||||
+ tests/AttrGrammar001.y
|
||||
+ tests/AttrGrammar002.y
|
||||
tests/error001.y
|
||||
tests/error001.stdout
|
||||
tests/error001.stderr
|
||||
tests/monad001.y
|
||||
+ tests/monaderror.y
|
||||
tests/Makefile
|
||||
tests/TestMulti.ly
|
||||
tests/Partial.ly
|
||||
--- happy-1.18.9-orig/tests/Makefile 2012-02-06 20:49:55.000000000 +1100
|
||||
+++ happy-1.18.9/tests/Makefile 2012-02-07 20:50:33.859004968 +1100
|
||||
@@ -1,5 +1,5 @@
|
||||
HAPPY=../dist/build/happy/happy
|
||||
-HC=ghc
|
||||
+HC=ghc -hide-all-packages -package base -package array -package mtl
|
||||
|
||||
TESTS = Test.ly TestMulti.ly TestPrecedence.ly bug001.ly \
|
||||
monad001.y monad002.ly precedence001.ly precedence002.y \
|
||||
--- /dev/null 2012-02-07 10:04:42.144206507 +1100
|
||||
+++ happy-1.18.9/tests/AttrGrammar001.y 2012-02-07 20:50:47.013316418 +1100
|
||||
@@ -0,0 +1,68 @@
|
||||
+{
|
||||
+import Control.Monad (unless)
|
||||
+}
|
||||
+
|
||||
+%tokentype { Char }
|
||||
+
|
||||
+%token a { 'a' }
|
||||
+%token b { 'b' }
|
||||
+%token c { 'c' }
|
||||
+
|
||||
+%attributetype { Attrs a }
|
||||
+%attribute value { a }
|
||||
+%attribute len { Int }
|
||||
+
|
||||
+%name parse abcstring
|
||||
+
|
||||
+%monad { Maybe }
|
||||
+
|
||||
+%%
|
||||
+
|
||||
+abcstring
|
||||
+ : alist blist clist
|
||||
+ { $$ = $1 ++ $2 ++ $3
|
||||
+ ; $2.len = $1.len
|
||||
+ ; $3.len = $1.len
|
||||
+ }
|
||||
+
|
||||
+alist
|
||||
+ : a alist
|
||||
+ { $$ = $1 : $>
|
||||
+ ; $$.len = $>.len + 1
|
||||
+ }
|
||||
+ | { $$ = []; $$.len = 0 }
|
||||
+
|
||||
+blist
|
||||
+ : b blist
|
||||
+ { $$ = $1 : $>
|
||||
+ ; $>.len = $$.len - 1
|
||||
+ }
|
||||
+ | { $$ = []
|
||||
+ ; where failUnless ($$.len == 0) "blist wrong length"
|
||||
+ }
|
||||
+
|
||||
+clist
|
||||
+ : c clist
|
||||
+ { $$ = $1 : $>
|
||||
+ ; $>.len = $$.len - 1
|
||||
+ }
|
||||
+ | { $$ = []
|
||||
+ ; where failUnless ($$.len == 0) "clist wrong length"
|
||||
+ }
|
||||
+
|
||||
+{
|
||||
+happyError = error "parse error"
|
||||
+failUnless b msg = unless b (fail msg)
|
||||
+
|
||||
+main = case parse "" of { Just _ ->
|
||||
+ case parse "abc" of { Just _ ->
|
||||
+ case parse "aaaabbbbcccc" of { Just _ ->
|
||||
+ case parse "abbcc" of { Nothing ->
|
||||
+ case parse "aabcc" of { Nothing ->
|
||||
+ case parse "aabbc" of { Nothing ->
|
||||
+ putStrLn "Test works";
|
||||
+ _ -> quit } ; _ -> quit }; _ -> quit };
|
||||
+ _ -> quit } ; _ -> quit }; _ -> quit }
|
||||
+
|
||||
+quit = putStrLn "Test failed"
|
||||
+}
|
||||
--- /dev/null 2012-02-07 10:04:42.144206507 +1100
|
||||
+++ happy-1.18.9/tests/AttrGrammar002.y 2012-02-07 20:50:47.013316418 +1100
|
||||
@@ -0,0 +1,58 @@
|
||||
+
|
||||
+%tokentype { Char }
|
||||
+
|
||||
+%token minus { '-' }
|
||||
+%token plus { '+' }
|
||||
+%token one { '1' }
|
||||
+%token zero { '0' }
|
||||
+
|
||||
+%attributetype { Attrs }
|
||||
+%attribute value { Integer }
|
||||
+%attribute pos { Int }
|
||||
+
|
||||
+%name parse start
|
||||
+
|
||||
+%monad { Maybe }
|
||||
+
|
||||
+%%
|
||||
+
|
||||
+start
|
||||
+ : num { $$ = $1 }
|
||||
+
|
||||
+num
|
||||
+ : bits { $$ = $1 ; $1.pos = 0 }
|
||||
+ | plus bits { $$ = $2 ; $2.pos = 0 }
|
||||
+ | minus bits { $$ = negate $2; $2.pos = 0 }
|
||||
+
|
||||
+bits
|
||||
+ : bit { $$ = $1
|
||||
+ ; $1.pos = $$.pos
|
||||
+ }
|
||||
+
|
||||
+ | bits bit { $$ = $1 + $2
|
||||
+ ; $1.pos = $$.pos + 1
|
||||
+ ; $2.pos = $$.pos
|
||||
+ }
|
||||
+
|
||||
+bit
|
||||
+ : zero { $$ = 0 }
|
||||
+ | one { $$ = 2^($$.pos) }
|
||||
+
|
||||
+
|
||||
+{
|
||||
+happyError msg = fail $ "parse error: "++msg
|
||||
+
|
||||
+main = case parse "" of { Nothing ->
|
||||
+ case parse "abc" of { Nothing ->
|
||||
+ case parse "0" of { Just 0 ->
|
||||
+ case parse "1" of { Just 1 ->
|
||||
+ case parse "101" of { Just 5 ->
|
||||
+ case parse "111" of { Just 7 ->
|
||||
+ case parse "10001" of { Just 17 ->
|
||||
+ putStrLn "Test worked";
|
||||
+ _ -> quit }; _ -> quit }; _ -> quit };
|
||||
+ _ -> quit }; _ -> quit }; _ -> quit };
|
||||
+ _ -> quit }
|
||||
+
|
||||
+quit = putStrLn "Test Failed"
|
||||
+}
|
||||
--- /dev/null 2012-02-07 10:04:42.144206507 +1100
|
||||
+++ happy-1.18.9/tests/ParGF.y 2012-02-07 20:50:47.014316443 +1100
|
||||
@@ -0,0 +1,40 @@
|
||||
+{-
|
||||
+
|
||||
+With Happy 1.17 this file produces "Internal Happy error" when run:
|
||||
+
|
||||
+$ happy ParGF.y && runghc ParGF.hs
|
||||
+ParGF.hs: Internal Happy error
|
||||
+
|
||||
+The problem is that we always pass around the "current token". When not
|
||||
+using %lexer and we've run out of tokens, the current token is notHappyAtAll,
|
||||
+which gets passed to happyError when there's an error.
|
||||
+
|
||||
+-}
|
||||
+
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+%name pGrammar
|
||||
+
|
||||
+%tokentype { String }
|
||||
+%error { parseError }
|
||||
+
|
||||
+%token
|
||||
+ 'a' { "a" }
|
||||
+
|
||||
+%%
|
||||
+
|
||||
+Grammar :: { () }
|
||||
+Grammar : 'a' 'a' { () }
|
||||
+
|
||||
+{
|
||||
+
|
||||
+parseError :: [String] -> a
|
||||
+-- commenting out the below line gets rid of the "Internal Happy Error"
|
||||
+parseError ("":_) = error "bar"
|
||||
+parseError _ = error "foo"
|
||||
+
|
||||
+main :: IO ()
|
||||
+main = print $ pGrammar ["a"]
|
||||
+
|
||||
+}
|
||||
--- /dev/null 2012-02-07 10:04:42.144206507 +1100
|
||||
+++ happy-1.18.9/tests/monaderror.y 2012-02-07 20:50:47.015316467 +1100
|
||||
@@ -0,0 +1,57 @@
|
||||
+{
|
||||
+module Main where
|
||||
+
|
||||
+import Data.Char
|
||||
+import Control.Monad.Error
|
||||
+import System.Exit
|
||||
+}
|
||||
+
|
||||
+%name parseFoo
|
||||
+%tokentype { Token }
|
||||
+%error { handleError }
|
||||
+
|
||||
+%monad { ParseM } { (>>=) } { return }
|
||||
+
|
||||
+%token
|
||||
+ 'S' { TokenSucc }
|
||||
+ 'Z' { TokenZero }
|
||||
+
|
||||
+%%
|
||||
+
|
||||
+Exp : 'Z' { 0 }
|
||||
+ | 'S' Exp { $2 + 1 }
|
||||
+
|
||||
+{
|
||||
+
|
||||
+type ParseM a = Either ParseError a
|
||||
+data ParseError
|
||||
+ = ParseError (Maybe Token)
|
||||
+ | StringError String
|
||||
+ deriving (Eq,Show)
|
||||
+instance Error ParseError where
|
||||
+ strMsg = StringError
|
||||
+
|
||||
+data Token
|
||||
+ = TokenSucc
|
||||
+ | TokenZero
|
||||
+ deriving (Eq,Show)
|
||||
+
|
||||
+handleError :: [Token] -> ParseM a
|
||||
+handleError [] = throwError $ ParseError Nothing
|
||||
+handleError ts = throwError $ ParseError $ Just $ head ts
|
||||
+
|
||||
+lexer :: String -> [Token]
|
||||
+lexer [] = []
|
||||
+lexer (c:cs)
|
||||
+ | isSpace c = lexer cs
|
||||
+ | c == 'S' = TokenSucc:(lexer cs)
|
||||
+ | c == 'Z' = TokenZero:(lexer cs)
|
||||
+ | otherwise = error "lexer error"
|
||||
+
|
||||
+main :: IO ()
|
||||
+main = do
|
||||
+ let tokens = lexer "S S"
|
||||
+ when (parseFoo tokens /= Left (ParseError Nothing)) $ do
|
||||
+ print (parseFoo tokens)
|
||||
+ exitWith (ExitFailure 1)
|
||||
+}
|
||||
@ -1,57 +0,0 @@
|
||||
--- hashed-storage-0.5.9-orig/Storage/Hashed/Tree.hs 2011-10-09 07:47:55.000000000 +1100
|
||||
+++ hashed-storage-0.5.9/Storage/Hashed/Tree.hs 2012-09-15 00:38:24.233669282 +1000
|
||||
@@ -41,6 +41,7 @@
|
||||
import Data.List( union, sort )
|
||||
import Control.Monad( filterM, liftM )
|
||||
import Control.Applicative( (<$>) )
|
||||
+import qualified Control.Exception ( catch, IOException )
|
||||
|
||||
--------------------------------
|
||||
-- Tree, Blob and friends
|
||||
@@ -195,7 +196,7 @@
|
||||
let
|
||||
subtree (name, sub) =
|
||||
do let here = path `appendPath` name
|
||||
- sub' <- (Just <$> unstub sub) `catch` \_ -> return Nothing
|
||||
+ sub' <- (Just <$> unstub sub) `Control.Exception.catch` \(_ :: Control.Exception.IOException) -> return Nothing
|
||||
case sub' of
|
||||
Nothing -> return $ Left [(here, treeHash t_, Nothing)]
|
||||
Just sub -> do
|
||||
@@ -204,10 +205,10 @@
|
||||
Left problems -> Left problems
|
||||
Right tree -> Right (name, SubTree tree)
|
||||
badBlob (_, f@(File (Blob s h))) =
|
||||
- fmap (/= h) (hashFunc f `catch` (\_ -> return NoHash))
|
||||
+ fmap (/= h) (hashFunc f `Control.Exception.catch` (\(_ :: Control.Exception.IOException) -> return NoHash))
|
||||
badBlob _ = return False
|
||||
render (name, f@(File (Blob _ h))) = do
|
||||
- h' <- (Just <$> hashFunc f) `catch` \_ -> return Nothing
|
||||
+ h' <- (Just <$> hashFunc f) `Control.Exception.catch` \(_ :: Control.Exception.IOException) -> return Nothing
|
||||
return (path `appendPath` name, h, h')
|
||||
subs <- mapM subtree [ x | x@(_, item) <- listImmediate t_, isSub item ]
|
||||
badBlobs <- filterM badBlob (listImmediate t) >>= mapM render
|
||||
--- hashed-storage-0.5.9-orig/Storage/Hashed/Darcs.hs 2011-10-09 07:47:55.000000000 +1100
|
||||
+++ hashed-storage-0.5.9/Storage/Hashed/Darcs.hs 2012-09-15 00:40:02.693038029 +1000
|
||||
@@ -1,4 +1,4 @@
|
||||
-{-# LANGUAGE BangPatterns #-}
|
||||
+{-# LANGUAGE BangPatterns, ScopedTypeVariables #-}
|
||||
|
||||
-- | A few darcs-specific utility functions. These are used for reading and
|
||||
-- writing darcs and darcs-compatible hashed trees.
|
||||
@@ -10,6 +10,7 @@
|
||||
import System.Directory( doesFileExist )
|
||||
import Codec.Compression.GZip( decompress, compress )
|
||||
import Control.Applicative( (<$>) )
|
||||
+import qualified Control.Exception ( catch, IOException )
|
||||
|
||||
import qualified Data.ByteString.Char8 as BS8
|
||||
import qualified Data.ByteString.Lazy.Char8 as BL8
|
||||
@@ -290,7 +291,7 @@
|
||||
|
||||
darcsPristineRefs :: FileSegment -> IO [Hash]
|
||||
darcsPristineRefs fs = do
|
||||
- con <- (darcsParseDir <$> readSegment fs) `catch` \_ -> return []
|
||||
+ con <- (darcsParseDir <$> readSegment fs) `Control.Exception.catch` \(_ :: Control.Exception.IOException) -> return []
|
||||
return $! [ hash | (_, _, _, hash) <- con, valid hash ]
|
||||
where valid NoHash = False
|
||||
valid _ = True
|
||||
@ -1,26 +0,0 @@
|
||||
--- HaXml-1.25-orig/src/Text/XML/HaXml/Schema/TypeConversion.hs 2014-10-29 02:53:24.000000000 +1100
|
||||
+++ HaXml-1.25/src/Text/XML/HaXml/Schema/TypeConversion.hs 2014-12-08 13:32:58.799433615 +1100
|
||||
@@ -38,7 +38,7 @@
|
||||
Just (Right
|
||||
(ComplexType
|
||||
{complex_name=Just t'}))
|
||||
- {-| t==t'-}
|
||||
+ {- | t==t' -}
|
||||
-> (e:)
|
||||
_ -> id
|
||||
_ -> id
|
||||
@@ -75,10 +75,10 @@
|
||||
renameSimple n s@UnionOf{} = s{ simple_name = Just n }
|
||||
|
||||
|
||||
--- * For now, rather than walk the tree, giving typenames to nodes that were
|
||||
--- previously locally-typed, we will instead assume in the pretty-printer
|
||||
--- that it can always replace a missing typename with the element name, and
|
||||
--- have it resolve to something sensible.
|
||||
+ -- * For now, rather than walk the tree, giving typenames to nodes that were
|
||||
+ -- previously locally-typed, we will instead assume in the pretty-printer
|
||||
+ -- that it can always replace a missing typename with the element name, and
|
||||
+ -- have it resolve to something sensible.
|
||||
renameLocals :: SchemaItem -> SchemaItem
|
||||
renameLocals s = s
|
||||
-- renameLocals (SchemaElement e)
|
||||
@ -1,37 +0,0 @@
|
||||
--- HDBC-odbc-2.3.1.0-orig/HDBC-odbc.cabal 2011-08-10 07:16:38.000000000 +1000
|
||||
+++ HDBC-odbc-2.3.1.0/HDBC-odbc.cabal 2011-08-12 14:51:43.510895477 +1000
|
||||
@@ -37,10 +37,10 @@
|
||||
ExistentialQuantification,
|
||||
ForeignFunctionInterface,
|
||||
ScopedTypeVariables
|
||||
- Build-Depends: base >= 4.3.1.0 && < 5
|
||||
+ Build-Depends: base >= 4.2.0.2 && < 5
|
||||
, mtl
|
||||
, HDBC>=2.1.0
|
||||
- , time>=1.2.0.3
|
||||
+ , time>=1.1.4
|
||||
, utf8-string
|
||||
, bytestring
|
||||
GHC-Options: -O2
|
||||
--- HDBC-odbc-2.3.1.0-orig/Database/HDBC/ODBC/Statement.hsc 2011-08-10 07:16:38.000000000 +1000
|
||||
+++ HDBC-odbc-2.3.1.0/Database/HDBC/ODBC/Statement.hsc 2011-08-12 15:16:11.585672600 +1000
|
||||
@@ -17,7 +17,7 @@
|
||||
import Database.HDBC.ODBC.Utils
|
||||
import Database.HDBC.ODBC.TypeConv
|
||||
|
||||
-import Foreign.C.String (castCUCharToChar)
|
||||
+import GHC.Base (unsafeChr)
|
||||
import Foreign.C.Types
|
||||
import Foreign.ForeignPtr
|
||||
import Foreign.Ptr
|
||||
@@ -55,6 +55,10 @@
|
||||
#let CALLCONV = "ccall"
|
||||
#endif
|
||||
|
||||
+-- | Convert a C @unsigned char@, representing a Latin-1 character, to
|
||||
+-- the corresponding Haskell character.
|
||||
+castCUCharToChar :: CUChar -> Char
|
||||
+castCUCharToChar ch = unsafeChr (fromIntegral (fromIntegral ch :: Word8))
|
||||
fGetQueryInfo :: Conn -> ChildList -> String
|
||||
-> IO ([SqlColDesc], [(String, SqlColDesc)])
|
||||
fGetQueryInfo iconn children query =
|
||||
@ -1,53 +0,0 @@
|
||||
--- HDBC-postgresql-2.3.2.1-orig/testsrc/TestSbasics.hs 2012-03-04 04:08:01.000000000 +1100
|
||||
+++ HDBC-postgresql-2.3.2.1/testsrc/TestSbasics.hs 2012-10-13 11:08:27.482597846 +1100
|
||||
@@ -1,10 +1,14 @@
|
||||
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
|
||||
module TestSbasics(tests) where
|
||||
import Test.HUnit
|
||||
import Data.List
|
||||
import Database.HDBC
|
||||
import TestUtils
|
||||
import System.IO
|
||||
-import Control.Exception hiding (catch)
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
+import Prelude hiding (catch)
|
||||
+#endif
|
||||
+import Control.Exception
|
||||
|
||||
openClosedb = sqlTestCase $
|
||||
do dbh <- connectDB
|
||||
@@ -142,7 +146,7 @@
|
||||
-- Let's try a rollback.
|
||||
catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
|
||||
fail "Foo"))
|
||||
- (\_ -> return ())
|
||||
+ (\(_::IOException) -> return ())
|
||||
sExecute qrysth []
|
||||
sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
|
||||
|
||||
--- HDBC-postgresql-2.3.2.1-orig/testsrc/Testbasics.hs 2012-03-04 04:08:01.000000000 +1100
|
||||
+++ HDBC-postgresql-2.3.2.1/testsrc/Testbasics.hs 2012-10-13 11:07:43.622396904 +1100
|
||||
@@ -1,9 +1,13 @@
|
||||
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
|
||||
module Testbasics(tests) where
|
||||
import Test.HUnit
|
||||
import Database.HDBC
|
||||
import TestUtils
|
||||
import System.IO
|
||||
-import Control.Exception hiding (catch)
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
+import Prelude hiding (catch)
|
||||
+#endif
|
||||
+import Control.Exception
|
||||
|
||||
openClosedb = sqlTestCase $
|
||||
do dbh <- connectDB
|
||||
@@ -140,7 +144,7 @@
|
||||
-- Let's try a rollback.
|
||||
catch (withTransaction dbh (\_ -> do executeMany sth rows
|
||||
fail "Foo"))
|
||||
- (\_ -> return ())
|
||||
+ (\(_::IOException) -> return ())
|
||||
execute qrysth []
|
||||
fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
--- HDBC-sqlite3-2.3.3.0-orig/testsrc/TestSbasics.hs 2011-08-10 07:08:57.000000000 +1000
|
||||
+++ HDBC-sqlite3-2.3.3.0/testsrc/TestSbasics.hs 2012-10-13 11:28:21.094200366 +1100
|
||||
@@ -1,9 +1,13 @@
|
||||
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
|
||||
module TestSbasics(tests) where
|
||||
import Test.HUnit
|
||||
import Database.HDBC
|
||||
import TestUtils
|
||||
import System.IO
|
||||
-import Control.Exception hiding (catch)
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
+import Prelude hiding (catch)
|
||||
+#endif
|
||||
+import Control.Exception
|
||||
|
||||
openClosedb = sqlTestCase $
|
||||
do dbh <- connectDB
|
||||
@@ -140,7 +144,7 @@
|
||||
-- Let's try a rollback.
|
||||
catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
|
||||
fail "Foo"))
|
||||
- (\_ -> return ())
|
||||
+ (\(_::IOException) -> return ())
|
||||
sExecute qrysth []
|
||||
sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
|
||||
|
||||
--- HDBC-sqlite3-2.3.3.0-orig/testsrc/Testbasics.hs 2011-08-10 07:08:57.000000000 +1000
|
||||
+++ HDBC-sqlite3-2.3.3.0/testsrc/Testbasics.hs 2012-10-13 11:27:20.025541058 +1100
|
||||
@@ -1,9 +1,13 @@
|
||||
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
|
||||
module Testbasics(tests) where
|
||||
import Test.HUnit
|
||||
import Database.HDBC
|
||||
import TestUtils
|
||||
import System.IO
|
||||
-import Control.Exception hiding (catch)
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
+import Prelude hiding (catch)
|
||||
+#endif
|
||||
+import Control.Exception
|
||||
|
||||
openClosedb = sqlTestCase $
|
||||
do dbh <- connectDB
|
||||
@@ -140,7 +144,7 @@
|
||||
-- Let's try a rollback.
|
||||
catch (withTransaction dbh (\_ -> do executeMany sth rows
|
||||
fail "Foo"))
|
||||
- (\_ -> return ())
|
||||
+ (\(_::IOException) -> return ())
|
||||
execute qrysth []
|
||||
fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
diff --git a/Database/HDBC/Locale.hs b/Database/HDBC/Locale.hs
|
||||
index e62b1c1..976a6a9 100644
|
||||
--- a/Database/HDBC/Locale.hs
|
||||
+++ b/Database/HDBC/Locale.hs
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
module Database.HDBC.Locale
|
||||
(
|
||||
defaultTimeLocale,
|
||||
@@ -5,7 +6,12 @@ module Database.HDBC.Locale
|
||||
)
|
||||
|
||||
where
|
||||
+
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+import Data.Time.Format (defaultTimeLocale)
|
||||
+#else
|
||||
import System.Locale (defaultTimeLocale)
|
||||
+#endif
|
||||
|
||||
-- | As the semantic of System.Locale.iso8601DateFormat has changed with
|
||||
-- old-locale-1.0.0.2 in a non-compatible way, we now define our own
|
||||
diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
|
||||
index 9724f81..0e278cd 100644
|
||||
--- a/Database/HDBC/SqlValue.hs
|
||||
+++ b/Database/HDBC/SqlValue.hs
|
||||
@@ -17,7 +17,11 @@ import Data.Char(ord,toUpper)
|
||||
import Data.Word
|
||||
import Data.Int
|
||||
import qualified System.Time as ST
|
||||
-import Data.Time
|
||||
+import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, NominalDiffTime, ParseTime
|
||||
+ , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, localDay, localTimeOfDay
|
||||
+ , parseTime, timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc
|
||||
+ , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, zonedTimeZone
|
||||
+ )
|
||||
import Data.Time.Clock.POSIX
|
||||
import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
|
||||
import Data.Ratio
|
||||
@ -1,43 +0,0 @@
|
||||
diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs
|
||||
index 0e278cd..1ebf114 100644
|
||||
--- a/Database/HDBC/SqlValue.hs
|
||||
+++ b/Database/HDBC/SqlValue.hs
|
||||
@@ -19,8 +19,13 @@ import Data.Int
|
||||
import qualified System.Time as ST
|
||||
import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, NominalDiffTime, ParseTime
|
||||
, TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, localDay, localTimeOfDay
|
||||
- , parseTime, timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc
|
||||
+ , timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc
|
||||
, utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, zonedTimeZone
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+ , parseTimeM
|
||||
+#else
|
||||
+ , parseTime
|
||||
+#endif
|
||||
)
|
||||
import Data.Time.Clock.POSIX
|
||||
import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat)
|
||||
@@ -665,7 +670,11 @@ instance Convertible (TimeOfDay, TimeZone) SqlValue where
|
||||
instance Convertible SqlValue (TimeOfDay, TimeZone) where
|
||||
safeConvert (SqlString x) =
|
||||
do tod <- parseTime' "%T%Q %z" x
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+ tz <- case parseTimeM True defaultTimeLocale "%T%Q %z" x of
|
||||
+#else
|
||||
tz <- case parseTime defaultTimeLocale "%T%Q %z" x of
|
||||
+#endif
|
||||
Nothing -> convError "Couldn't extract timezone in" (SqlString x)
|
||||
Just y -> Right y
|
||||
return (tod, tz)
|
||||
@@ -939,7 +948,11 @@ parseTime' _ inpstr =
|
||||
#else
|
||||
parseTime' :: (Typeable t, Convertible SqlValue t, ParseTime t) => String -> String -> ConvertResult t
|
||||
parseTime' fmtstr inpstr =
|
||||
+#if MIN_VERSION_time(1,5,0)
|
||||
+ case parseTimeM True defaultTimeLocale fmtstr inpstr of
|
||||
+#else
|
||||
case parseTime defaultTimeLocale fmtstr inpstr of
|
||||
+#endif
|
||||
Nothing -> convError ("Cannot parse using default format string " ++ show fmtstr)
|
||||
(SqlString inpstr)
|
||||
Just x -> Right x
|
||||
@ -1,154 +0,0 @@
|
||||
--- HTTP-4000.2.3-orig/HTTP.cabal 2012-04-13 06:39:31.000000000 +1000
|
||||
+++ HTTP-4000.2.3/HTTP.cabal 2012-09-12 21:08:30.027554352 +1000
|
||||
@@ -77,7 +77,7 @@
|
||||
Network.HTTP.Utils
|
||||
Paths_HTTP
|
||||
GHC-options: -fwarn-missing-signatures -Wall
|
||||
- Build-depends: base >= 2 && < 4.6, network, parsec
|
||||
+ Build-depends: base >= 2 && < 5.0, network, parsec
|
||||
Extensions: FlexibleInstances
|
||||
if flag(old-base)
|
||||
Build-depends: base < 3
|
||||
@@ -95,7 +95,7 @@
|
||||
Test-Suite test
|
||||
type: exitcode-stdio-1.0
|
||||
|
||||
- build-tools: ghc >= 6.10 && < 7.6
|
||||
+ build-tools: ghc >= 6.10 && < 8.0
|
||||
|
||||
hs-source-dirs: test
|
||||
main-is: httpTests.hs
|
||||
@@ -103,7 +103,7 @@
|
||||
build-depends: HTTP,
|
||||
HUnit,
|
||||
httpd-shed,
|
||||
- base >= 2 && < 4.6,
|
||||
+ base >= 2 && < 5.0,
|
||||
network,
|
||||
split >= 0.1 && < 0.2,
|
||||
test-framework,
|
||||
--- HTTP-4000.2.3-orig/Network/HTTP/Base.hs 2012-04-13 06:39:31.000000000 +1000
|
||||
+++ HTTP-4000.2.3/Network/HTTP/Base.hs 2012-09-12 21:44:26.218546007 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE ScopedTypeVariables #-}
|
||||
-----------------------------------------------------------------------------
|
||||
-- |
|
||||
-- Module : Network.HTTP.Base
|
||||
@@ -105,6 +106,7 @@
|
||||
, parseURIReference
|
||||
)
|
||||
|
||||
+import Control.Exception ( catch )
|
||||
import Control.Monad ( guard )
|
||||
import Control.Monad.Error ()
|
||||
import Data.Char ( digitToInt, intToDigit, toLower, isDigit,
|
||||
@@ -886,10 +888,10 @@
|
||||
-- | @catchIO a h@ handles IO action exceptions throughout codebase; version-specific
|
||||
-- tweaks better go here.
|
||||
catchIO :: IO a -> (IOException -> IO a) -> IO a
|
||||
-catchIO a h = Prelude.catch a h
|
||||
+catchIO a h = Control.Exception.catch a h
|
||||
|
||||
catchIO_ :: IO a -> IO a -> IO a
|
||||
-catchIO_ a h = Prelude.catch a (const h)
|
||||
+catchIO_ a h = Control.Exception.catch a (\(_ :: IOException) -> h)
|
||||
|
||||
responseParseError :: String -> String -> Result a
|
||||
responseParseError loc v = failWith (ErrorParse (loc ++ ' ':v))
|
||||
--- HTTP-4000.2.3-orig/Network/TCP.hs 2012-04-13 06:39:31.000000000 +1000
|
||||
+++ HTTP-4000.2.3/Network/TCP.hs 2012-09-12 21:51:35.633839689 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE ScopedTypeVariables #-}
|
||||
{-# LANGUAGE TypeSynonymInstances #-}
|
||||
-----------------------------------------------------------------------------
|
||||
-- |
|
||||
@@ -57,6 +58,7 @@
|
||||
|
||||
import Data.Char ( toLower )
|
||||
import Data.Word ( Word8 )
|
||||
+import qualified Control.Exception ( catch, IOException )
|
||||
import Control.Concurrent
|
||||
import Control.Monad ( liftM, when )
|
||||
import System.IO ( Handle, hFlush, IOMode(..), hClose )
|
||||
@@ -302,7 +304,7 @@
|
||||
ConnClosed -> print "aa" >> return False
|
||||
_
|
||||
| connEndPoint v == endPoint ->
|
||||
- catch (getPeerName (connSock v) >> return True) (const $ return False)
|
||||
+ Control.Exception.catch (getPeerName (connSock v) >> return True) (\(_:: Control.Exception.IOException) -> return False)
|
||||
| otherwise -> return False
|
||||
|
||||
isTCPConnectedTo :: HandleStream ty -> EndPoint -> IO Bool
|
||||
@@ -312,7 +314,7 @@
|
||||
ConnClosed -> return False
|
||||
_
|
||||
| connEndPoint v == endPoint ->
|
||||
- catch (getPeerName (connSock v) >> return True) (const $ return False)
|
||||
+ Control.Exception.catch (getPeerName (connSock v) >> return True) (\(_:: Control.Exception.IOException) -> return False)
|
||||
| otherwise -> return False
|
||||
|
||||
readBlockBS :: HStream a => HandleStream a -> Int -> IO (Result a)
|
||||
@@ -364,18 +366,18 @@
|
||||
modifyMVar_ (getRef ref) (\ co -> return co{connInput=Just b})
|
||||
return (return a)
|
||||
_ -> do
|
||||
- Prelude.catch (buf_hGet (connBuffer conn) (connHandle conn) n >>= return.return)
|
||||
+ Control.Exception.catch (buf_hGet (connBuffer conn) (connHandle conn) n >>= return.return)
|
||||
(\ e ->
|
||||
if isEOFError e
|
||||
then do
|
||||
- when (connCloseEOF conn) $ catch (closeQuick ref) (\ _ -> return ())
|
||||
+ when (connCloseEOF conn) $ Control.Exception.catch (closeQuick ref) (\ (_ :: Control.Exception.IOException) -> return ())
|
||||
return (return (buf_empty (connBuffer conn)))
|
||||
else return (failMisc (show e)))
|
||||
|
||||
bufferPutBlock :: BufferOp a -> Handle -> a -> IO (Result ())
|
||||
bufferPutBlock ops h b =
|
||||
- Prelude.catch (buf_hPut ops h b >> hFlush h >> return (return ()))
|
||||
- (\ e -> return (failMisc (show e)))
|
||||
+ Control.Exception.catch (buf_hPut ops h b >> hFlush h >> return (return ()))
|
||||
+ (\ (e :: Control.Exception.IOException) -> return (failMisc (show e)))
|
||||
|
||||
bufferReadLine :: HStream a => HandleStream a -> IO (Result a)
|
||||
bufferReadLine ref = onNonClosedDo ref $ \ conn -> do
|
||||
@@ -385,13 +387,13 @@
|
||||
let (newl,b1) = buf_splitAt (connBuffer conn) 1 b0
|
||||
modifyMVar_ (getRef ref) (\ co -> return co{connInput=Just b1})
|
||||
return (return (buf_append (connBuffer conn) a newl))
|
||||
- _ -> Prelude.catch
|
||||
+ _ -> Control.Exception.catch
|
||||
(buf_hGetLine (connBuffer conn) (connHandle conn) >>=
|
||||
return . return . appendNL (connBuffer conn))
|
||||
(\ e ->
|
||||
if isEOFError e
|
||||
then do
|
||||
- when (connCloseEOF conn) $ catch (closeQuick ref) (\ _ -> return ())
|
||||
+ when (connCloseEOF conn) $ Control.Exception.catch (closeQuick ref) (\ (_ :: Control.Exception.IOException) -> return ())
|
||||
return (return (buf_empty (connBuffer conn)))
|
||||
else return (failMisc (show e)))
|
||||
where
|
||||
--- HTTP-4000.2.3-orig/Network/StreamSocket.hs 2012-04-13 06:39:31.000000000 +1000
|
||||
+++ HTTP-4000.2.3/Network/StreamSocket.hs 2012-09-12 22:27:16.119222147 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE ScopedTypeVariables #-}
|
||||
{-# OPTIONS_GHC -fno-warn-orphans #-}
|
||||
-----------------------------------------------------------------------------
|
||||
-- |
|
||||
@@ -36,7 +37,7 @@
|
||||
import Network.HTTP.Base ( catchIO )
|
||||
import Control.Monad (liftM)
|
||||
import Control.Exception as Exception (IOException)
|
||||
-import System.IO.Error (catch, isEOFError)
|
||||
+import System.IO.Error (isEOFError)
|
||||
|
||||
-- | Exception handler for socket operations.
|
||||
handleSocketError :: Socket -> IOException -> IO (Result a)
|
||||
@@ -50,7 +51,7 @@
|
||||
myrecv :: Socket -> Int -> IO String
|
||||
myrecv sock len =
|
||||
let handler e = if isEOFError e then return [] else ioError e
|
||||
- in System.IO.Error.catch (recv sock len) handler
|
||||
+ in catchIO (recv sock len) handler
|
||||
|
||||
instance Stream Socket where
|
||||
readBlock sk n = readBlockSocket sk n
|
||||
@ -1,9 +0,0 @@
|
||||
--- hxt-regex-xmlschema-9.0.1-orig/hxt-regex-xmlschema.cabal 2011-08-15 23:57:32.000000000 +1000
|
||||
+++ hxt-regex-xmlschema-9.0.1/hxt-regex-xmlschema.cabal 2011-08-16 11:50:27.245104305 +1000
|
||||
@@ -47,6 +47,5 @@
|
||||
ghc-prof-options: -auto-all -caf-all
|
||||
|
||||
build-depends: base >= 4 && < 5,
|
||||
- haskell98 >= 1 && < 2,
|
||||
parsec >= 2.1 && < 4,
|
||||
hxt-charproperties >= 9 && < 10
|
||||
@ -1,11 +0,0 @@
|
||||
--- lifted-base-0.1.0.1-orig/test.hs 2011-12-03 22:38:23.000000000 +1100
|
||||
+++ lifted-base-0.1.0.1/test.hs 2011-12-11 22:33:38.889902803 +1100
|
||||
@@ -37,7 +37,7 @@
|
||||
main :: IO ()
|
||||
main = defaultMain
|
||||
[ testSuite "IdentityT" runIdentityT
|
||||
- , testSuite "ListT" $ fmap head . runListT
|
||||
+-- , testSuite "ListT" $ fmap head . runListT
|
||||
, testSuite "MaybeT" $ fmap fromJust . runMaybeT
|
||||
, testSuite "ReaderT" $ flip runReaderT "reader state"
|
||||
, testSuite "WriterT" runWriterT'
|
||||
@ -1,13 +0,0 @@
|
||||
--- lifted-base-0.2-orig/Control/Exception/Lifted.hs 2012-10-05 15:29:06.000000000 +1000
|
||||
+++ lifted-base-0.2/Control/Exception/Lifted.hs 2012-11-03 10:44:27.063099107 +1100
|
||||
@@ -13,6 +13,10 @@
|
||||
{-# LANGUAGE Trustworthy #-}
|
||||
#endif
|
||||
|
||||
+#if __GLASGOW_HASKELL__ >= 707
|
||||
+{-# LANGUAGE ImpredicativeTypes #-}
|
||||
+#endif
|
||||
+
|
||||
{- |
|
||||
Module : Control.Exception.Lifted
|
||||
Copyright : Bas van Dijk, Anders Kaseorg
|
||||
@ -1,17 +0,0 @@
|
||||
Make sure ./configure can eat --with-hc and --with-hc-pkg without giving QA
|
||||
warnings.
|
||||
|
||||
diff -rN -u old-network-2.2.0.0/configure.ac new-network-2.2.0.0/configure.ac
|
||||
--- old-network-2.2.0.0/configure.ac 2009-07-21 22:07:20.000000000 +0200
|
||||
+++ new-network-2.2.0.0/configure.ac 2009-07-21 22:07:20.000000000 +0200
|
||||
@@ -14,6 +14,10 @@
|
||||
|
||||
AC_C_CONST
|
||||
|
||||
+dnl * dummy options to eat --with-hc= and --with-hc-pkg= flags
|
||||
+AC_ARG_WITH([hc], [(dummy option)], [])
|
||||
+AC_ARG_WITH([hc-pkg], [(dummy option)], [])
|
||||
+
|
||||
dnl ** check for specific header (.h) files that we are interested in
|
||||
AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h sys/types.h unistd.h winsock.h])
|
||||
AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h netinet/tcp.h sys/socket.h sys/uio.h sys/un.h])
|
||||
@ -1,69 +0,0 @@
|
||||
--- network-2.3.0.14-orig/network.cabal 2012-06-04 10:25:39.000000000 +1000
|
||||
+++ network-2.3.0.14/network.cabal 2012-06-27 20:21:38.271566190 +1000
|
||||
@@ -39,7 +39,7 @@
|
||||
Network.Socket.ByteString.MsgHdr
|
||||
|
||||
build-depends:
|
||||
- base >= 3 && < 4.6,
|
||||
+ base >= 3 && < 4.7,
|
||||
bytestring < 1.0,
|
||||
parsec >= 2.0 && < 3.2
|
||||
|
||||
@@ -62,11 +62,11 @@
|
||||
type: exitcode-stdio-1.0
|
||||
|
||||
build-depends:
|
||||
- base < 4.6,
|
||||
- bytestring < 0.10,
|
||||
+ base < 4.7,
|
||||
+ bytestring < 1.0,
|
||||
HUnit < 1.3,
|
||||
network,
|
||||
- test-framework < 0.6,
|
||||
+ test-framework < 0.7,
|
||||
test-framework-hunit < 0.3
|
||||
|
||||
test-suite uri
|
||||
@@ -75,10 +75,10 @@
|
||||
type: exitcode-stdio-1.0
|
||||
|
||||
build-depends:
|
||||
- base < 4.6,
|
||||
+ base < 4.7,
|
||||
HUnit < 1.3,
|
||||
network,
|
||||
- test-framework < 0.6,
|
||||
+ test-framework < 0.7,
|
||||
test-framework-hunit < 0.3
|
||||
|
||||
source-repository head
|
||||
--- network-2.3.0.14-orig/Network/BSD.hsc 2012-06-04 10:25:39.000000000 +1000
|
||||
+++ network-2.3.0.14/Network/BSD.hsc 2012-06-28 18:07:39.287001755 +1000
|
||||
@@ -112,7 +112,9 @@
|
||||
import Foreign.Marshal.Array (allocaArray0, peekArray0)
|
||||
import Foreign.Marshal.Utils (with, fromBool)
|
||||
import Data.Typeable
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
import Prelude hiding (catch)
|
||||
+#endif
|
||||
import System.IO.Error (ioeSetErrorString, mkIOError)
|
||||
import System.IO.Unsafe (unsafePerformIO)
|
||||
|
||||
--- network-2.3.0.14-orig/tests/Simple.hs 2012-06-04 10:25:39.000000000 +1000
|
||||
+++ network-2.3.0.14/tests/Simple.hs 2012-06-28 18:18:31.176027682 +1000
|
||||
@@ -1,4 +1,4 @@
|
||||
-{-# LANGUAGE ScopedTypeVariables #-}
|
||||
+{-# LANGUAGE CPP, ScopedTypeVariables #-}
|
||||
{-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
|
||||
|
||||
module Main where
|
||||
@@ -10,7 +10,9 @@
|
||||
import qualified Data.ByteString.Char8 as C
|
||||
import Network.Socket hiding (recv, recvFrom, send, sendTo)
|
||||
import Network.Socket.ByteString
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
import Prelude hiding (catch)
|
||||
+#endif
|
||||
import Test.Framework (Test, defaultMain, testGroup)
|
||||
import Test.Framework.Providers.HUnit (testCase)
|
||||
import Test.HUnit (Assertion, (@=?))
|
||||
@ -1,39 +0,0 @@
|
||||
commit 6bc6b666ba2a87001a825bd81088062307a51bae
|
||||
Author: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun Jan 13 23:50:21 2013 +0300
|
||||
|
||||
MsgHdr.hsc: fix field 'struct msghdr::msg_namelen' size
|
||||
|
||||
msg_namelen has a 'socklen_t' type on linux (always 32 bits).
|
||||
Using CSize there breaks 64-bit BE platforms.
|
||||
|
||||
testSendManyTo: [Failed]
|
||||
ERROR: sendmsg: invalid argument (Destination address required)
|
||||
|
||||
Caught by testSendManyTo test on ppc64:
|
||||
|
||||
Gentoo-bug: http://bugs.gentoo.org/436640
|
||||
Reported-by: Anthony Basile <blueness@gentoo.org>
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
diff --git a/Network/Socket/ByteString/MsgHdr.hsc b/Network/Socket/ByteString/MsgHdr.hsc
|
||||
index 24d7eb0..227e5ee 100644
|
||||
--- a/Network/Socket/ByteString/MsgHdr.hsc
|
||||
+++ b/Network/Socket/ByteString/MsgHdr.hsc
|
||||
@@ -8,6 +8,7 @@ module Network.Socket.ByteString.MsgHdr
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
+import Data.Word -- for used '#type's
|
||||
import Foreign.C.Types (CInt, CSize)
|
||||
import Foreign.Ptr (Ptr)
|
||||
import Foreign.Storable (Storable(..))
|
||||
@@ -20,7 +21,7 @@ import Network.Socket.ByteString.IOVec (IOVec)
|
||||
-- don't exist on OpenSolaris.
|
||||
data MsgHdr = MsgHdr
|
||||
{ msgName :: Ptr SockAddr
|
||||
- , msgNameLen :: CSize
|
||||
+ , msgNameLen :: (#type socklen_t) {- 32 bits even on amd64 and ppc64 -}
|
||||
, msgIov :: Ptr IOVec
|
||||
, msgIovLen :: CSize
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
--- options-1.2.1-orig/lib/Options/Tokenize.hs 2014-12-14 16:34:53.000000000 +1100
|
||||
+++ options-1.2.1/lib/Options/Tokenize.hs 2015-01-02 00:14:05.390013340 +1100
|
||||
@@ -11,6 +11,7 @@
|
||||
, tokenize
|
||||
) where
|
||||
|
||||
+import Control.Applicative
|
||||
import Control.Monad.Error hiding (throwError)
|
||||
import qualified Control.Monad.Error
|
||||
import Control.Monad.State
|
||||
@@ -53,6 +54,13 @@
|
||||
|
||||
newtype Tok a = Tok { unTok :: ErrorT String (StateT TokState Identity) a }
|
||||
|
||||
+instance Functor Tok where
|
||||
+ fmap = liftM
|
||||
+
|
||||
+instance Applicative Tok where
|
||||
+ pure = return
|
||||
+ (<*>) = ap
|
||||
+
|
||||
instance Monad Tok where
|
||||
return = Tok . return
|
||||
m >>= f = Tok (unTok m >>= unTok . f)
|
||||
@ -1,55 +0,0 @@
|
||||
From 28704350d7b6148b2edbd5e8883c1c2dfba4f0ba Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Wed, 21 Nov 2012 23:44:33 +0300
|
||||
Subject: [PATCH] cabal: make depends on test libraries optional
|
||||
|
||||
before the patch 'QuickCheck' and friends were required unconditionally:
|
||||
|
||||
$ runhaskell Setup.hs configure -v -ftest | grep QuickCheck
|
||||
Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
|
||||
$ runhaskell Setup.hs configure -v -f-test | grep QuickCheck
|
||||
Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
|
||||
|
||||
the patch fixes it by putting 'build-depends' under condition
|
||||
|
||||
$ runhaskell Setup.hs configure -v -f-test | grep -i quickcheck
|
||||
$ runhaskell Setup.hs configure -v -ftest | grep -i quickcheck
|
||||
Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
---
|
||||
SHA.cabal | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/SHA.cabal b/SHA.cabal
|
||||
index a146b52..1ec2624 100644
|
||||
--- a/SHA.cabal
|
||||
+++ b/SHA.cabal
|
||||
@@ -37,9 +37,12 @@ Library
|
||||
Ghc-Options: -fregs-graph
|
||||
|
||||
Executable test_sha
|
||||
- build-depends: base >= 4 && < 6, bytestring, binary, array,
|
||||
- QuickCheck == 2.*, test-framework >= 0.3,
|
||||
- test-framework-quickcheck2 >= 0.2
|
||||
+ if flag(test)
|
||||
+ build-depends: base >= 4 && < 6, bytestring, binary, array,
|
||||
+ QuickCheck == 2.*, test-framework >= 0.3,
|
||||
+ test-framework-quickcheck2 >= 0.2
|
||||
+ else
|
||||
+ buildable: False
|
||||
Main-Is: Test.hs
|
||||
Other-Modules: Data.Digest.Pure.SHA
|
||||
|
||||
@@ -51,8 +54,6 @@ Executable test_sha
|
||||
if impl(ghc >= 6.12)
|
||||
Ghc-Options: -fregs-graph
|
||||
|
||||
- if !flag(test)
|
||||
- buildable: False
|
||||
|
||||
Executable sha1
|
||||
build-depends: base >= 4 && < 6, bytestring, binary, array, directory
|
||||
--
|
||||
1.8.0
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/syb.cabal b/syb.cabal
|
||||
index cc3aaa8..1f3a313 100644
|
||||
--- a/syb.cabal
|
||||
+++ b/syb.cabal
|
||||
@@ -26,7 +26,7 @@ extra-source-files: tests/*.hs,
|
||||
|
||||
Library {
|
||||
hs-source-dirs: src
|
||||
- build-depends: base >= 4.0 && < 4.4
|
||||
+ build-depends: base >= 4.0 && < 4.5
|
||||
exposed-modules: Data.Generics,
|
||||
Data.Generics.Basics,
|
||||
Data.Generics.Instances,
|
||||
@ -1,11 +0,0 @@
|
||||
--- tar-0.3.1.0-orig/Codec/Archive/Tar/Write.hs 2009-06-06 23:51:00.000000000 +1000
|
||||
+++ tar-0.3.1.0/Codec/Archive/Tar/Write.hs 2011-12-24 09:36:10.928384175 +1100
|
||||
@@ -119,7 +119,7 @@
|
||||
putString n s = take n s ++ fill (n - length s) '\NUL'
|
||||
|
||||
--TODO: check integer widths, eg for large file sizes
|
||||
-putOct :: Integral a => FieldWidth -> a -> String
|
||||
+putOct :: (Integral a, Show a) => FieldWidth -> a -> String
|
||||
putOct n x =
|
||||
let octStr = take (n-1) $ showOct x ""
|
||||
in fill (n - length octStr - 1) '0'
|
||||
@ -1,11 +0,0 @@
|
||||
setup: dist/doc/html/tasty-golden/haddock-prolog10293.txt: invalid argument
|
||||
diff --git a/tasty-golden.cabal b/tasty-golden.cabal
|
||||
index aa61a0a..70292f8 100644
|
||||
--- a/tasty-golden.cabal
|
||||
+++ b/tasty-golden.cabal
|
||||
@@ -5 +5 @@ description:
|
||||
- This package provides support for «golden testing».
|
||||
+ This package provides support for "golden testing".
|
||||
@@ -9 +9 @@ description:
|
||||
- «golden» file, which contains the correct result for the test.
|
||||
+ "golden" file, which contains the correct result for the test.
|
||||
@ -1,31 +0,0 @@
|
||||
--- testpack-2.1.2-orig/src/Test/HUnit/Tools.hs 2012-02-29 09:20:32.000000000 +1100
|
||||
+++ testpack-2.1.2/src/Test/HUnit/Tools.hs 2012-07-09 09:03:53.104931180 +1000
|
||||
@@ -128,7 +128,13 @@
|
||||
> q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
|
||||
-}
|
||||
qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
|
||||
-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
|
||||
+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest,
|
||||
+#if MIN_VERSION_QuickCheck(2,5,0)
|
||||
+ maxDiscardRatio = if maxTest /= 0 then 20000 `div` maxTest else 10
|
||||
+#else
|
||||
+ maxDiscard = 20000
|
||||
+#endif
|
||||
+ })
|
||||
|
||||
{- | Run verbose tests. Example:
|
||||
|
||||
@@ -174,7 +180,12 @@
|
||||
Just (rnd,_) -> return rnd
|
||||
test MkState{ terminal = tm
|
||||
, maxSuccessTests = maxSuccess args
|
||||
- , maxDiscardedTests = maxDiscard args
|
||||
+ , maxDiscardedTests =
|
||||
+#if MIN_VERSION_QuickCheck(2,5,0)
|
||||
+ maxDiscardRatio args * maxSuccess args
|
||||
+#else
|
||||
+ maxDiscard args
|
||||
+#endif
|
||||
, computeSize = case replay args of
|
||||
Nothing -> \n d -> (n * maxSize args)
|
||||
`div` maxSuccess args
|
||||
@ -1,45 +0,0 @@
|
||||
--- testpack-2.1.2.1-orig/testpack.cabal 2013-02-26 02:03:46.000000000 +1100
|
||||
+++ testpack-2.1.2.1/testpack.cabal 2013-03-14 12:10:12.741512817 +1100
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
Build-Depends: base >= 3 && < 5,
|
||||
mtl, HUnit,
|
||||
- QuickCheck >= 2.1.0.3 && < 2.5
|
||||
+ QuickCheck >= 2.1.0.3
|
||||
|
||||
If flag(splitBase)
|
||||
Build-Depends: base >= 3 && < 5, containers, random
|
||||
--- testpack-2.1.2-quickcheck-2.5/src/Test/HUnit/Tools.hs 2012-07-09 09:03:53.104931180 +1000
|
||||
+++ testpack-2.1.2.1/src/Test/HUnit/Tools.hs 2013-03-14 12:51:13.403489351 +1100
|
||||
@@ -169,10 +169,15 @@
|
||||
-- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
|
||||
localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
|
||||
localquickCheckWithResult args p =
|
||||
- do
|
||||
#if MIN_VERSION_QuickCheck(2,3,0)
|
||||
+#if MIN_VERSION_QuickCheck(2,6,0)
|
||||
+ (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
|
||||
+#else
|
||||
+ do
|
||||
tm <- if chatty args then newStdioTerminal else newNullTerminal
|
||||
+#endif
|
||||
#else
|
||||
+ do
|
||||
tm <- newTerminal
|
||||
#endif
|
||||
rnd <- case replay args of
|
||||
--- testpack-2.1.2.1-orig/src/Test/QuickCheck/Tools.hs 2013-02-26 02:03:46.000000000 +1100
|
||||
+++ testpack-2.1.2.1/src/Test/QuickCheck/Tools.hs 2013-03-14 12:46:14.922492197 +1100
|
||||
@@ -23,8 +23,12 @@
|
||||
|
||||
)
|
||||
where
|
||||
+#if MIN_VERSION_QuickCheck(2,6,0)
|
||||
+import Test.QuickCheck.Property (Result(..), callbacks, expect, interrupted, ok, reason, stamp)
|
||||
+#else
|
||||
import Test.QuickCheck hiding (Result, reason)
|
||||
import Test.QuickCheck.Property
|
||||
+#endif
|
||||
|
||||
{- | Compare two values. If same, the test passes. If different, the result indicates
|
||||
what was expected and what was received as part of the error. -}
|
||||
@ -1,182 +0,0 @@
|
||||
--- testpack-2.1.2.1-orig/testpack.cabal 2013-02-26 02:03:46.000000000 +1100
|
||||
+++ testpack-2.1.2.1/testpack.cabal 2014-07-03 20:47:34.432871930 +1000
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
Build-Depends: base >= 3 && < 5,
|
||||
mtl, HUnit,
|
||||
- QuickCheck >= 2.1.0.3 && < 2.5
|
||||
+ QuickCheck >= 2.1.0.3 && < 2.8
|
||||
|
||||
If flag(splitBase)
|
||||
Build-Depends: base >= 3 && < 5, containers, random
|
||||
--- testpack-2.1.2.1-orig/src/Test/HUnit/Tools.hs 2013-02-26 02:03:46.000000000 +1100
|
||||
+++ testpack-2.1.2.1/src/Test/HUnit/Tools.hs 2014-07-03 21:01:50.373614959 +1000
|
||||
@@ -25,7 +25,14 @@
|
||||
import Test.QuickCheck.Property hiding (Result(reason))
|
||||
import qualified Control.Exception
|
||||
import qualified Test.HUnit as HU
|
||||
-import System.Random
|
||||
+#if MIN_VERSION_QuickCheck(2,7,0)
|
||||
+import Test.QuickCheck.Random (newQCGen, QCGen(..))
|
||||
+import System.Random (split)
|
||||
+#else
|
||||
+import System.Random (newStdGen, StdGen(..), split)
|
||||
+#define newStdGen newQCGen
|
||||
+#define StdGen QCGen
|
||||
+#endif
|
||||
import System.IO
|
||||
import Text.Printf
|
||||
|
||||
@@ -96,7 +103,7 @@
|
||||
|
||||
{-
|
||||
-- | modified version of the tests function from Test.QuickCheck
|
||||
-tests :: Args -> Gen Result -> StdGen -> Int -> Int -> [[String]] -> IO ()
|
||||
+tests :: Args -> Gen Result -> QCGen -> Int -> Int -> [[String]] -> IO ()
|
||||
tests config gen rnd0 ntest nfail stamps
|
||||
| ntest == maxSuccess config = return ()
|
||||
| nfail == maxDiscard config = assertFailure $ "Arguments exhausted after " ++ show ntest ++ " tests."
|
||||
@@ -128,7 +135,13 @@
|
||||
> q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
|
||||
-}
|
||||
qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
|
||||
-qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
|
||||
+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest,
|
||||
+#if MIN_VERSION_QuickCheck(2,5,0)
|
||||
+ maxDiscardRatio = if maxTest /= 0 then 20000 `div` maxTest else 10
|
||||
+#else
|
||||
+ maxDiscard = 20000
|
||||
+#endif
|
||||
+ })
|
||||
|
||||
{- | Run verbose tests. Example:
|
||||
|
||||
@@ -163,18 +176,28 @@
|
||||
-- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
|
||||
localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
|
||||
localquickCheckWithResult args p =
|
||||
- do
|
||||
#if MIN_VERSION_QuickCheck(2,3,0)
|
||||
+#if MIN_VERSION_QuickCheck(2,6,0)
|
||||
+ (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
|
||||
+#else
|
||||
+ do
|
||||
tm <- if chatty args then newStdioTerminal else newNullTerminal
|
||||
+#endif
|
||||
#else
|
||||
+ do
|
||||
tm <- newTerminal
|
||||
#endif
|
||||
rnd <- case replay args of
|
||||
- Nothing -> newStdGen
|
||||
+ Nothing -> newQCGen
|
||||
Just (rnd,_) -> return rnd
|
||||
test MkState{ terminal = tm
|
||||
, maxSuccessTests = maxSuccess args
|
||||
- , maxDiscardedTests = maxDiscard args
|
||||
+ , maxDiscardedTests =
|
||||
+#if MIN_VERSION_QuickCheck(2,5,0)
|
||||
+ maxDiscardRatio args * maxSuccess args
|
||||
+#else
|
||||
+ maxDiscard args
|
||||
+#endif
|
||||
, computeSize = case replay args of
|
||||
Nothing -> \n d -> (n * maxSize args)
|
||||
`div` maxSuccess args
|
||||
@@ -190,17 +213,23 @@
|
||||
#endif
|
||||
, numSuccessShrinks = 0
|
||||
, numTryShrinks = 0
|
||||
+#if MIN_VERSION_QuickCheck(2,7,0)
|
||||
+ , numRecentlyDiscardedTests = 0
|
||||
+ , numTotTryShrinks = 0
|
||||
+ } (unGen (unProperty (property p)))
|
||||
+#else
|
||||
} (unGen (property p))
|
||||
+#endif
|
||||
where
|
||||
--------------------------------------------------------------------------
|
||||
-- main test loop
|
||||
- test :: State -> (StdGen -> Int -> Prop) -> IO Result
|
||||
+ test :: State -> (QCGen -> Int -> Prop) -> IO Result
|
||||
test st f
|
||||
| numSuccessTests st >= maxSuccessTests st = doneTesting st f
|
||||
| numDiscardedTests st >= maxDiscardedTests st = giveUp st f
|
||||
| otherwise = runATest st f
|
||||
|
||||
- doneTesting :: State -> (StdGen -> Int -> Prop) -> IO Result
|
||||
+ doneTesting :: State -> (QCGen -> Int -> Prop) -> IO Result
|
||||
doneTesting st f =
|
||||
do
|
||||
#if MIN_VERSION_QuickCheck(2,3,0)
|
||||
@@ -221,7 +250,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
- giveUp :: State -> (StdGen -> Int -> Prop) -> IO Result
|
||||
+ giveUp :: State -> (QCGen -> Int -> Prop) -> IO Result
|
||||
giveUp st f =
|
||||
do
|
||||
#if MIN_VERSION_QuickCheck(2,3,0)
|
||||
@@ -234,7 +263,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
- runATest :: State -> (StdGen -> Int -> Prop) -> IO Result
|
||||
+ runATest :: State -> (QCGen -> Int -> Prop) -> IO Result
|
||||
runATest st f =
|
||||
do
|
||||
let size = computeSize st (numSuccessTests st) (numDiscardedTests st)
|
||||
@@ -266,7 +295,12 @@
|
||||
Just False -> -- failed test
|
||||
do
|
||||
#if MIN_VERSION_QuickCheck(2,3,0)
|
||||
+#if MIN_VERSION_QuickCheck(2,3,0)
|
||||
+ (numShrinks, totFailed, lastFailed) <- foundFailure st res ts
|
||||
+#else
|
||||
numShrinks <- foundFailure st res ts
|
||||
+#endif
|
||||
+
|
||||
theOutput <- terminalOutput (terminal st)
|
||||
#else
|
||||
foundFailure st res ts
|
||||
@@ -288,5 +322,9 @@
|
||||
, numShrinks = numShrinks
|
||||
, output = theOutput
|
||||
#endif
|
||||
+#if MIN_VERSION_QuickCheck(2,7,0)
|
||||
+ , numShrinkTries = totFailed
|
||||
+ , numShrinkFinal = lastFailed
|
||||
+#endif
|
||||
}
|
||||
where (rnd1,rnd2) = split (randomSeed st)
|
||||
--- testpack-2.1.2.1-orig/src/Test/QuickCheck/Tools.hs 2013-02-26 02:03:46.000000000 +1100
|
||||
+++ testpack-2.1.2.1/src/Test/QuickCheck/Tools.hs 2014-07-03 21:01:23.932306995 +1000
|
||||
@@ -23,15 +23,27 @@
|
||||
|
||||
)
|
||||
where
|
||||
+#if MIN_VERSION_QuickCheck(2,6,0)
|
||||
+import Test.QuickCheck.Property (Result(..), callbacks, expect, theException, ok, reason, stamp)
|
||||
+#if MIN_VERSION_QuickCheck(2,7,0)
|
||||
+#else
|
||||
+import Test.QuickCheck.Property (Result(..), callbacks, expect, interrupted, ok, reason, stamp)
|
||||
+#endif
|
||||
+#else
|
||||
import Test.QuickCheck hiding (Result, reason)
|
||||
import Test.QuickCheck.Property
|
||||
+#endif
|
||||
|
||||
{- | Compare two values. If same, the test passes. If different, the result indicates
|
||||
what was expected and what was received as part of the error. -}
|
||||
(@=?) :: (Eq a, Show a) => a -> a -> Result
|
||||
expected @=? actual =
|
||||
MkResult {ok = Just (expected == actual),
|
||||
+#if MIN_VERSION_QuickCheck(2,7,0)
|
||||
+ expect = True, theException = Nothing,
|
||||
+#else
|
||||
expect = True, interrupted = False,
|
||||
+#endif
|
||||
reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
|
||||
stamp = [], callbacks = []}
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/Network/Wai.hs b/Network/Wai.hs
|
||||
index 626b30d..8189592 100644
|
||||
--- a/Network/Wai.hs
|
||||
+++ b/Network/Wai.hs
|
||||
@@ -1,6 +1,7 @@
|
||||
{-# LANGUAGE Rank2Types #-}
|
||||
{-# LANGUAGE ExistentialQuantification #-}
|
||||
{-# LANGUAGE DeriveDataTypeable #-}
|
||||
+{-# LANGUAGE CPP #-}
|
||||
{-|
|
||||
|
||||
This module defines a generic web application interface. It is a common
|
||||
@@ -61,7 +62,11 @@ import qualified Network.HTTP.Types as H
|
||||
import Data.Text (Text)
|
||||
import Data.ByteString.Lazy.Char8 () -- makes it easier to use responseLBS
|
||||
import Blaze.ByteString.Builder (fromByteString)
|
||||
+#if MIN_VERSION_vault(0,3,0)
|
||||
+import Data.Vault.Lazy (Vault)
|
||||
+#else
|
||||
import Data.Vault (Vault)
|
||||
+#endif
|
||||
import Data.Word (Word64)
|
||||
|
||||
-- | Information on the request sent by the client. This abstracts away the
|
||||
@ -1,29 +0,0 @@
|
||||
--- wxcore-0.90.0.1-orig/wxcore.cabal 2012-05-15 06:26:55.000000000 +1000
|
||||
+++ wxcore-0.90.0.1/wxcore.cabal 2012-05-19 21:32:01.230849131 +1000
|
||||
@@ -80,7 +80,7 @@
|
||||
build-depends:
|
||||
array >= 0.2 && < 0.5,
|
||||
base >= 4 && < 5,
|
||||
- containers >= 0.2 && < 0.5
|
||||
+ containers >= 0.2 && < 0.6
|
||||
else
|
||||
build-depends:
|
||||
array >= 0.1 && < 0.3,
|
||||
--- wxcore-0.90.0.1-orig/src/haskell/Graphics/UI/WXCore/Events.hs 2012-05-15 06:26:55.000000000 +1000
|
||||
+++ wxcore-0.90.0.1/src/haskell/Graphics/UI/WXCore/Events.hs 2012-05-19 21:44:09.457185166 +1000
|
||||
@@ -1,4 +1,4 @@
|
||||
-{-# LANGUAGE ForeignFunctionInterface #-}
|
||||
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
|
||||
-----------------------------------------------------------------------------------------
|
||||
{-| Module : Events
|
||||
Copyright : (c) Daan Leijen 2003
|
||||
@@ -245,6 +245,9 @@
|
||||
import Foreign.Marshal.Alloc
|
||||
import Foreign.Marshal.Array
|
||||
import Foreign.Marshal.Utils
|
||||
+#if (__GLASGOW_HASKELL__>=705)
|
||||
+import Foreign.C.Types(CInt(..))
|
||||
+#endif
|
||||
|
||||
import Data.Char ( chr ) -- used in stc
|
||||
import Data.Maybe ( fromMaybe, fromJust )
|
||||
@ -1,18 +0,0 @@
|
||||
--- wxcore-0.90.1.1-orig/src/haskell/Graphics/UI/WXCore/Events.hs 2014-03-23 08:01:17.000000000 +1100
|
||||
+++ wxcore-0.90.1.1/src/haskell/Graphics/UI/WXCore/Events.hs 2014-03-23 17:05:26.428738461 +1100
|
||||
@@ -1,4 +1,4 @@
|
||||
-{-# LANGUAGE ForeignFunctionInterface #-}
|
||||
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
|
||||
-----------------------------------------------------------------------------------------
|
||||
{-| Module : Events
|
||||
Copyright : (c) Daan Leijen 2003
|
||||
@@ -248,6 +248,9 @@
|
||||
import Foreign.Marshal.Alloc
|
||||
import Foreign.Marshal.Array
|
||||
import Foreign.Marshal.Utils
|
||||
+#if (__GLASGOW_HASKELL__>=705)
|
||||
+import Foreign.C.Types(CInt(..))
|
||||
+#endif
|
||||
|
||||
import Data.Char ( chr ) -- used in stc
|
||||
import Data.Maybe ( fromMaybe, fromJust )
|
||||
@ -1,74 +0,0 @@
|
||||
--- wxdirect-0.13.1.2-orig/wxdirect.cabal 2012-02-07 18:26:28.000000000 +1100
|
||||
+++ wxdirect-0.13.1.2/wxdirect.cabal 2012-11-29 17:03:30.132111644 +1100
|
||||
@@ -68,7 +68,7 @@
|
||||
if flag(splitBase)
|
||||
build-depends:
|
||||
base >= 4 && < 5,
|
||||
- containers >= 0.2 && < 0.5
|
||||
+ containers >= 0.2 && < 0.6
|
||||
else
|
||||
build-depends:
|
||||
base >= 3 && < 4,
|
||||
--- wxdirect-0.13.1.2-orig/src/ParseEiffel.hs 2012-02-07 18:26:28.000000000 +1100
|
||||
+++ wxdirect-0.13.1.2/src/ParseEiffel.hs 2013-01-11 20:11:46.192991896 +1100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE ScopedTypeVariables #-}
|
||||
-----------------------------------------------------------------------------------------
|
||||
{-| Module : ParseEiffel
|
||||
Copyright : (c) Daan Leijen 2003
|
||||
@@ -12,6 +13,8 @@
|
||||
-----------------------------------------------------------------------------------------
|
||||
module ParseEiffel( parseEiffel ) where
|
||||
|
||||
+import Prelude hiding ( catch )
|
||||
+import Control.Exception ( catch, IOException )
|
||||
import Data.Char( digitToInt )
|
||||
import Text.ParserCombinators.Parsec
|
||||
import qualified Text.ParserCombinators.Parsec.Token as P
|
||||
@@ -33,7 +36,7 @@
|
||||
|
||||
getDefaultEiffelFiles :: IO [FilePath]
|
||||
getDefaultEiffelFiles
|
||||
- = do wxwin <- getEnv "WXWIN" `catch` \err -> return ""
|
||||
+ = do wxwin <- getEnv "WXWIN" `catch` \(err::IOException) -> return ""
|
||||
return [wxwin ++ "/wxc/include/wxc_defs.e"
|
||||
,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"]
|
||||
|
||||
--- wxdirect-0.13.1.2-orig/src/Classes.hs 2012-02-07 18:26:28.000000000 +1100
|
||||
+++ wxdirect-0.13.1.2/src/Classes.hs 2012-11-29 17:12:55.416713615 +1100
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-----------------------------------------------------------------------------------------
|
||||
{-| Module : Classes
|
||||
Copyright : (c) Daan Leijen 2003
|
||||
@@ -28,7 +29,9 @@
|
||||
import Data.List( sort, sortBy )
|
||||
import qualified Data.Set as Set
|
||||
import qualified Data.Map as Map
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
import Prelude hiding ( catch )
|
||||
+#endif
|
||||
import HaskellNames( haskellTypeName, isBuiltin )
|
||||
import Types
|
||||
|
||||
--- wxdirect-0.13.1.2-orig/src/CompileClasses.hs 2012-02-07 18:26:28.000000000 +1100
|
||||
+++ wxdirect-0.13.1.2/src/CompileClasses.hs 2012-11-29 17:12:55.417713640 +1100
|
||||
@@ -89,7 +89,7 @@
|
||||
(exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
|
||||
|
||||
methodCount = length decls
|
||||
- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
|
||||
+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
|
||||
|
||||
export = concat [ ["module " ++ moduleRoot ++ moduleName
|
||||
, " ( -- * Global" ]
|
||||
@@ -103,6 +103,9 @@
|
||||
, "import System.IO.Unsafe( unsafePerformIO )"
|
||||
, "import " ++ moduleRoot ++ "WxcTypes"
|
||||
, "import " ++ moduleRoot ++ moduleClassTypesName
|
||||
+ , "#if (__GLASGOW_HASKELL__>=705)"
|
||||
+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
|
||||
+ , "#endif"
|
||||
, ""
|
||||
]
|
||||
]
|
||||
@ -1,49 +0,0 @@
|
||||
--- wxdirect-0.90.0.1-orig/wxdirect.cabal 2012-04-19 01:05:11.000000000 +1000
|
||||
+++ wxdirect-0.90.0.1/wxdirect.cabal 2012-05-19 21:12:02.612085338 +1000
|
||||
@@ -66,7 +66,7 @@
|
||||
if flag(splitBase)
|
||||
build-depends:
|
||||
base >= 4 && < 5,
|
||||
- containers >= 0.2 && < 0.5
|
||||
+ containers >= 0.2 && < 0.6
|
||||
else
|
||||
build-depends:
|
||||
base >= 3 && < 4,
|
||||
--- wxdirect-0.90.0.1-orig/src/Classes.hs 2012-04-19 01:05:10.000000000 +1000
|
||||
+++ wxdirect-0.90.0.1/src/Classes.hs 2012-07-14 13:58:48.072492467 +1000
|
||||
@@ -1,3 +1,4 @@
|
||||
+{-# LANGUAGE CPP #-}
|
||||
-----------------------------------------------------------------------------------------
|
||||
{-| Module : Classes
|
||||
Copyright : (c) Daan Leijen 2003
|
||||
@@ -28,7 +29,9 @@
|
||||
import Data.List( sort, sortBy )
|
||||
import qualified Data.Set as Set
|
||||
import qualified Data.Map as Map
|
||||
+#if !MIN_VERSION_base(4,6,0)
|
||||
import Prelude hiding ( catch )
|
||||
+#endif
|
||||
import HaskellNames( haskellTypeName, isBuiltin )
|
||||
import Types
|
||||
|
||||
--- wxdirect-0.90.0.1-orig/src/CompileClasses.hs 2012-04-19 01:05:10.000000000 +1000
|
||||
+++ wxdirect-0.90.0.1/src/CompileClasses.hs 2012-05-19 21:28:27.358052781 +1000
|
||||
@@ -89,7 +89,7 @@
|
||||
(exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
|
||||
|
||||
methodCount = length decls
|
||||
- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
|
||||
+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
|
||||
|
||||
export = concat [ ["module " ++ moduleRoot ++ moduleName
|
||||
, " ( -- * Global" ]
|
||||
@@ -103,6 +103,9 @@
|
||||
, "import System.IO.Unsafe( unsafePerformIO )"
|
||||
, "import " ++ moduleRoot ++ "WxcTypes"
|
||||
, "import " ++ moduleRoot ++ moduleClassTypesName
|
||||
+ , "#if (__GLASGOW_HASKELL__>=705)"
|
||||
+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
|
||||
+ , "#endif"
|
||||
, ""
|
||||
]
|
||||
]
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs
|
||||
index d8a2b2e..cec2c11 100644
|
||||
--- a/Yesod/Core/Types.hs
|
||||
+++ b/Yesod/Core/Types.hs
|
||||
@@ -49,7 +49,7 @@ import qualified Network.Wai as W
|
||||
import qualified Network.Wai.Parse as NWP
|
||||
import System.Log.FastLogger (LogStr, LoggerSet, toLogStr, pushLogStr)
|
||||
import qualified System.Random.MWC as MWC
|
||||
-import Network.Wai.Logger (DateCacheGetter)
|
||||
+import Network.Wai.Logger
|
||||
import Text.Blaze.Html (Html, toHtml)
|
||||
import Text.Hamlet (HtmlUrl)
|
||||
import Text.Julius (JavascriptUrl)
|
||||
@@ -553,7 +553,7 @@ instance ParseRoute WaiSubsite where
|
||||
|
||||
data Logger = Logger
|
||||
{ loggerSet :: !LoggerSet
|
||||
- , loggerDate :: !DateCacheGetter
|
||||
+ , loggerDate :: !(IO ZonedDate)
|
||||
}
|
||||
|
||||
loggerPutStr :: Logger -> LogStr -> IO ()
|
||||
@ -0,0 +1,168 @@
|
||||
#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
|
||||
#
|
||||
# Utility to update Gentoo TeXLive distribution configuration files
|
||||
#
|
||||
|
||||
echo "Configuring TeXLive ..."
|
||||
|
||||
PATH="@GENTOO_PORTAGE_EPREFIX@"/bin:"@GENTOO_PORTAGE_EPREFIX@"/usr/bin
|
||||
|
||||
# Fix for all those with altered umask for root
|
||||
umask 022
|
||||
|
||||
# Ensure reliable order when concatenating files, bug #579018
|
||||
LC_COLLATE=C
|
||||
|
||||
# Make sure we have a correct environment, bug #30432
|
||||
# The list of env. vars is taken from the INSTALL file
|
||||
for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
|
||||
DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
|
||||
MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
|
||||
OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
|
||||
T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
|
||||
TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
|
||||
TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
|
||||
VFFONTS XDVIFONTS XDVIVFS ; do
|
||||
|
||||
if [ "${!texvar}" ]; then
|
||||
if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
|
||||
export ${texvar}="${!texvar}:"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$TEXINPUTS" ]; then
|
||||
if $(echo ${TEXINPUTS} | grep '@GENTOO_PORTAGE_EPREFIX@/usr/share/texmf' &>/dev/null) ; then
|
||||
export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|@GENTOO_PORTAGE_EPREFIX@/usr/share/texmf/*:\?||g')
|
||||
elif $(echo ${TEXINPUTS} | grep '@GENTOO_PORTAGE_EPREFIX@/var/lib/texmf' &>/dev/null) ; then
|
||||
export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|@GENTOO_PORTAGE_EPREFIX@/var/lib/texmf/*:\?||g')
|
||||
fi
|
||||
fi
|
||||
|
||||
MKTEMP_COMMAND="mktemp -t tmp.XXXXXXXXXX"
|
||||
DIFF_COMMAND="cmp -s"
|
||||
TEMP_FILE="`${MKTEMP_COMMAND}`"
|
||||
|
||||
if [ -z "${TEMP_FILE}" ]; then
|
||||
exit
|
||||
fi
|
||||
|
||||
# check whether config files for fmtutil and updmap have changed
|
||||
STATUS_FMTUTIL="0"
|
||||
STATUS_UPDMAP="0"
|
||||
|
||||
if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/texmf.d ]; then
|
||||
echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/texmf.cnf from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/texmf.d ..."
|
||||
cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/texmf.d/*.cnf > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/texmf.cnf"
|
||||
fi
|
||||
|
||||
if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/fmtutil.d ]; then
|
||||
echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/fmtutil.cnf from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/fmtutil.d ..."
|
||||
if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ]; then
|
||||
cp -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
|
||||
else
|
||||
touch ${TEMP_FILE}
|
||||
fi
|
||||
cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/fmtutil.d/*.cnf > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/fmtutil.cnf"
|
||||
${DIFF_COMMAND} "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
|
||||
STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
|
||||
else
|
||||
# if no regeneration took place:
|
||||
# always regenerate the formats to be on the safe side
|
||||
STATUS_FMTUTIL="${STATUS_FMTUTIL}3"
|
||||
fi
|
||||
|
||||
if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/updmap.d ]; then
|
||||
if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ]; then
|
||||
cp -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
|
||||
else
|
||||
touch ${TEMP_FILE}
|
||||
fi
|
||||
echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/updmap.cfg from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/updmap.d ..."
|
||||
cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/updmap.d/*.cfg > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/updmap.cfg"
|
||||
${DIFF_COMMAND} "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
|
||||
STATUS_UPDMAP="${STATUS_UPDMAP}$?"
|
||||
else
|
||||
# if no regeneration could be done:
|
||||
# always regenerate the maps to be on the safe side
|
||||
STATUS_UPDMAP="${STATUS_UPDMAP}3"
|
||||
fi
|
||||
|
||||
echo "Generating ls-R files"
|
||||
mktexlsr &>/dev/null
|
||||
|
||||
# Generate language.dat file, from texlive install-pkg.sh
|
||||
X=`kpsewhich language.dat`
|
||||
Z=`dirname $X`
|
||||
if [ -n "$X" -a -f "$Z/language.dat" -a -f "$Z/language.us" ] ; then
|
||||
echo "Generating language.dat file"
|
||||
|
||||
# Save the old one, we will check if it has changed
|
||||
cp -f "$Z/language.dat" "${TEMP_FILE}"
|
||||
|
||||
cat "$Z/language.us" > "$Z/language.dat"
|
||||
for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.dat.d/language.*.dat; do
|
||||
[ -f "$i" ] && cat "$i" >> "$Z/language.dat"
|
||||
done
|
||||
|
||||
${DIFF_COMMAND} "$Z/language.dat" "${TEMP_FILE}"
|
||||
STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
|
||||
fi
|
||||
|
||||
# Generate language.def file.
|
||||
if [ -n "$X" -a -f "$Z/language.def" -a -f "$Z/language.us.def" ] ; then
|
||||
echo "Generating language.def file"
|
||||
|
||||
# Save the old one, we will check if it has changed
|
||||
cp -f "$Z/language.def" "${TEMP_FILE}"
|
||||
|
||||
cat "$Z/language.us.def" > "$Z/language.def"
|
||||
for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.def.d/language.*.def; do
|
||||
[ -f "$i" ] && cat "$i" >> "$Z/language.def"
|
||||
done
|
||||
cat << EOF >> "$Z/language.def"
|
||||
%%% No changes may be made beyond this point.
|
||||
|
||||
\uselanguage {USenglish} %%% This MUST be the last line of the file.
|
||||
EOF
|
||||
|
||||
${DIFF_COMMAND} "$Z/language.def" "${TEMP_FILE}"
|
||||
STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
|
||||
fi
|
||||
|
||||
# Generate language.dat.lua file.
|
||||
if [ -n "$X" -a -f "$Z/language.dat.lua" -a -f "$Z/language.us.lua" ] ; then
|
||||
echo "Generating language.dat.lua file"
|
||||
|
||||
# Save the old one, we will check if it has changed
|
||||
cp -f "$Z/language.dat.lua" "${TEMP_FILE}"
|
||||
|
||||
cat "$Z/language.us.lua" > "$Z/language.dat.lua"
|
||||
for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.dat.lua.d/language.*.dat.lua; do
|
||||
[ -f "$i" ] && cat "$i" >> "$Z/language.dat.lua"
|
||||
done
|
||||
printf "}\n" >> "$Z/language.dat.lua"
|
||||
|
||||
${DIFF_COMMAND} "$Z/language.dat.lua" "${TEMP_FILE}"
|
||||
STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
|
||||
fi
|
||||
|
||||
if [ "${STATUS_FMTUTIL}" -ne 0 ] ; then
|
||||
echo "Generating format files ..."
|
||||
fmtutil-sys --all &>/dev/null
|
||||
else
|
||||
echo "Skipping format files, since they are unchanged"
|
||||
fi
|
||||
|
||||
if [ "${STATUS_UPDMAP}" -ne 0 ] ; then
|
||||
echo "Generating font maps..."
|
||||
updmap-sys &>/dev/null
|
||||
else
|
||||
echo "Skipping font maps, since they are unchanged"
|
||||
fi
|
||||
|
||||
rm -f ${TEMP_FILE}
|
||||
|
||||
echo
|
||||
echo "Use 'texconfig font ro'(rw) to disable (enable) font generation for users"
|
||||
echo
|
||||
@ -1,2 +1,3 @@
|
||||
DIST geometric_shapes-0.4.3.tar.gz 57689 SHA256 9030b7713ca397852f7d0d19caf18ddd7c93ff0236c19e31d01e72e655bc407b SHA512 77cf3d4d9603f29357bd26d3e4fcec077589f25292f467204bedc072c10ac3dc3869f2491697d6f3a6f23149dcc3973b7fa4f50b94c0e6f3f4ee92b8319ed12e WHIRLPOOL 92acf4d7056c03fcd9479e47c9747856fd1d67f846aaf0d48e84967c5f8cb1a1a7318276306e2324af6a9efa4586de06fe740b6b171824e39edd89e750faff4c
|
||||
DIST geometric_shapes-0.4.4.tar.gz 57894 SHA256 4d600890b72d0b20b2fbcc9ded06464a37c871317445ec32d3858bd719b0aa02 SHA512 414864fae6808342f6ca1fc50afe165d585f483698585454396b135a2e12aca998d785edf6526b02d3a58ac27e1e7651e8ece71e32860d49d7dc5f6e06bb892d WHIRLPOOL bdd540bbd13ac17cd60fd39f7ba33e829f76e188b65c530d2b7031aa835b3fdd190fda88f5362fca727ec88c9dca5520756040d9a73d3b38183b511395f8b59c
|
||||
DIST geometric_shapes-0.5.0.tar.gz 56795 SHA256 a4d53a982e388b6d188602dc67bab8971cd145e6e724a07274e53c12f512e379 SHA512 3062c63668243ea262b3fabf7964deab53b36edfc1016e86c5bfcf1853a49232a1c3ddfa9935b7cc69e4bcd545befc703299424d58a2dc2188c361bdfd70b581 WHIRLPOOL 077c39229d415222880a9e7e0266aed38049b8cbc2d8e26e3d6f7c7957d092a84ead5ee1a35b37e453127773028169c299b202872b94b301b0bbb23250f8757b
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Generic definitions of geometric shapes and bodies"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-cpp/eigen:3
|
||||
dev-libs/boost:=
|
||||
media-libs/qhull
|
||||
media-libs/assimp
|
||||
sci-libs/octomap
|
||||
dev-ros/random_numbers
|
||||
dev-ros/resource_retriever
|
||||
dev-ros/eigen_stl_containers
|
||||
dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-cpp/gtest dev-ros/rosunit )
|
||||
"
|
||||
@ -1,3 +1 @@
|
||||
DIST robot_state_publisher-1.13.0.tar.gz 23807 SHA256 53ce1f6f523b9c0568534db339e938a10f7cc00f937cb802b89a6e6c65d7d366 SHA512 fcf352d72e18f43ec020a74287de1bbbe6453d54d3f2fe8a1a49e08c3e0d494b94b9f866e241acb4991c28dd7931645c22c7ac16d219a0f3104efb1ec9adc9f3 WHIRLPOOL 4f2b71e1232b83966d5131dc951a50f894c31eb8813b2b74055bfec3145f19ec1261d2a42c1da177f833f0d03907dd8b2cfa700e290daa4a917c5961c474a378
|
||||
DIST robot_state_publisher-1.13.1.tar.gz 24718 SHA256 9ceac644ad281634d58ff35c31e0d6424f65cf70aadb1210a1f68295dba1de62 SHA512 1c2bea57ee55bd2dffbdc9ff6e033b4a22c153306c8ee4ac610e3551109959c33f66eaec10337c5f11fa9245f87defb47acbe98ee8cf37eef6fad343bc0b1e3d WHIRLPOOL 2da46774acc61a3c0acf4458b0a2acb558e49b9a96377a5a98fb12872a81897143f1d39357b03c5c90a34443f36627f856e70e9a6ffb0f87fa2622834bb9092f
|
||||
DIST robot_state_publisher-1.13.2.tar.gz 24774 SHA256 b4bc99d4ba01ca59dffd81aac99d3420a1035f960fdf5eac17d1aa96790ce28d SHA512 0b9f3f01f015b37cb6e1636271441d0e5dc60e7bd16c4ac897c3c3dbdb9fe589453bc66b1610d8b13ba006a68e1c223cf102a8e6a8ae55a57757b2924c2dafbe WHIRLPOOL 733b3ad512e7fa9b8be0f2eb373cfd1a691170ea97bb19b4ec14a7485313e2e7463a6bedeffa4c4fbc5a4833ea4a264f6d9e29cb36ac1eaa4a92fbfa399432d1
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
Index: robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h
|
||||
===================================================================
|
||||
--- robot_state_publisher-1.13.2.orig/include/robot_state_publisher/joint_state_listener.h
|
||||
+++ robot_state_publisher-1.13.2/include/robot_state_publisher/joint_state_listener.h
|
||||
@@ -48,7 +48,7 @@ using namespace ros;
|
||||
using namespace KDL;
|
||||
|
||||
typedef boost::shared_ptr<sensor_msgs::JointState const> JointStateConstPtr;
|
||||
-typedef std::map<std::string, boost::shared_ptr<urdf::JointMimic> > MimicMap;
|
||||
+typedef std::map<std::string, std::shared_ptr<urdf::JointMimic> > MimicMap;
|
||||
|
||||
namespace robot_state_publisher{
|
||||
|
||||
Index: robot_state_publisher-1.13.2/src/joint_state_listener.cpp
|
||||
===================================================================
|
||||
--- robot_state_publisher-1.13.2.orig/src/joint_state_listener.cpp
|
||||
+++ robot_state_publisher-1.13.2/src/joint_state_listener.cpp
|
||||
@@ -161,7 +161,7 @@ int main(int argc, char** argv)
|
||||
|
||||
MimicMap mimic;
|
||||
|
||||
- for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
+ for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
if(i->second->mimic){
|
||||
mimic.insert(make_pair(i->first, i->second->mimic));
|
||||
}
|
||||
Index: robot_state_publisher-1.13.2/test/test_subclass.cpp
|
||||
===================================================================
|
||||
--- robot_state_publisher-1.13.2.orig/test/test_subclass.cpp
|
||||
+++ robot_state_publisher-1.13.2/test/test_subclass.cpp
|
||||
@@ -82,7 +82,7 @@ TEST(TestRobotStatePubSubclass, robot_st
|
||||
|
||||
MimicMap mimic;
|
||||
|
||||
- for(std::map< std::string, boost::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
+ for(std::map< std::string, std::shared_ptr< urdf::Joint > >::iterator i = model.joints_.begin(); i != model.joints_.end(); i++){
|
||||
if(i->second->mimic){
|
||||
mimic.insert(make_pair(i->first, i->second->mimic));
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Package for publishing the state of a robot to tf"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/kdl_parser
|
||||
dev-cpp/eigen:3
|
||||
sci-libs/orocos_kdl
|
||||
dev-ros/roscpp
|
||||
dev-ros/rosconsole
|
||||
dev-ros/rostime
|
||||
dev-ros/tf2_ros
|
||||
dev-ros/tf2_kdl
|
||||
dev-ros/kdl_conversions
|
||||
dev-ros/sensor_msgs
|
||||
dev-ros/tf
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-ros/rostest[${PYTHON_USEDEP}]
|
||||
"
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
|
||||
KEYWORDS="~amd64 ~arm"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit ros-catkin
|
||||
|
||||
DESCRIPTION="Package for publishing the state of a robot to tf"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-ros/kdl_parser
|
||||
dev-cpp/eigen:3
|
||||
sci-libs/orocos_kdl
|
||||
dev-ros/roscpp
|
||||
dev-ros/rosconsole
|
||||
dev-ros/rostime
|
||||
dev-ros/tf2_ros
|
||||
dev-ros/tf2_kdl
|
||||
dev-ros/kdl_conversions
|
||||
dev-ros/sensor_msgs
|
||||
dev-ros/tf
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-ros/rostest[${PYTHON_USEDEP}]
|
||||
"
|
||||
@ -1 +1,2 @@
|
||||
DIST daemons-1.2.3.gem 24576 SHA256 0fbf1f7ef654e98fac324b43ab690576fbe8b66941693b473f4f27ef334c032d SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277 WHIRLPOOL 9568c383912195964b0079df60f8342268a51d75c0251b50e5c747759b82463d3d79a597e593a24ee84eb8618a637bcb22cb842b7c9a43d67db1f0be41c72e5c
|
||||
DIST daemons-1.2.4.tar.gz 27191 SHA256 34e28ad4f5b8fa402f7f2783949024da09575dcde6b8110242ca2048ad932608 SHA512 9b6f0202ad87704b441f150ae5c3f5086861ba220069b6e7219714b62c36711889fdd094cfc1de907e9fb4528e5f6bb42b5421b9bcc4ec286648349e78da280f WHIRLPOOL 4b0454884b1bec01eed876dabc3a9cb50b25bfd77d26c374ac6ee98d7d3c8ccc18b852a9da36e39ded2047f847961f6400af9d0ec0515c7afb826718e35ce3a7
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="Releases README.md"
|
||||
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
|
||||
HOMEPAGE="https://github.com/thuehlinger/daemons"
|
||||
SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE="examples"
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e '/\(pry\|simplecov\)/I s:^:#:' spec/spec_helper.rb || die
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
use examples || return
|
||||
|
||||
insinto /usr/share/doc/${PF}/
|
||||
doins -r examples
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST mimemagic-0.3.1.gem 352768 SHA256 8fb981c19040ccc22888f17f2665ae829bc2fa0983b644c6947d4494b7d0a379 SHA512 7478f7354c36b151c2fab664677fb153c890feafa42c941e1ad00af93f52da6f1bb82516f1298142837d14f0c611b84510cc6fd878da9379535bf47bc1c6f4d7 WHIRLPOOL 7620883359a71eeddbbe21cc87c83968f87345ff85fb8dcfb0f92e19da99c16921b0df8a41e39084a47d78f92c05567a13e1bde6efd780647f68033933d5e455
|
||||
DIST mimemagic-0.3.2.gem 366080 SHA256 78b0601d780a3a0f4bb48c88e03af6dc06610a59bc0f10a877deb50d6b602b02 SHA512 0d919ecf7f787c1b72ea337945089070db3647976192adeb510985542962a9efc9a2dc62c51024a9a32afbebf804c21745cc06d6d4738f570f1d2eee0b1ae181 WHIRLPOOL 237050c733e25b16e4921f9af4afe598881fa0f40448e283d49005be7f28da592a70547dffdf75fda5c0da847433b7529e1e9f768deeaf21ce4a649606db511b
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_EXTRADOC="README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Fast mime detection by extension or content"
|
||||
HOMEPAGE="https://github.com/minad/mimemagic"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/bacon )"
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -S bacon -q -Ilib:test test/*_test.rb || die
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST ruby_dep-1.3.1.gem 9728 SHA256 14814183f004eba3e3db9c9b534b65208294412ab99aa337e934a5f4bbfd186c SHA512 d689510c4bc1a7ed0f5cdf2f0c22f9d724ffaf74e23f1d618e51ffb744ceaaa1f44a724282e30b1894e9f7e1015452c8a337b924254c0725211873720b5e76cb WHIRLPOOL cb680e7527f58e4c9c7c87d2b14dd4d6f8e130e9882ba361febc017b613168913489d3095753aa7dc85e29241c10efcb3159fdbd61c10b7d6f235d54ff203aa6
|
||||
DIST ruby_dep-1.4.0.gem 10752 SHA256 87bcd14e9642b14adee31292ce5fedcfafc4dd95ad1b7a9ae5b33ee0ef3b258a SHA512 83e8f52a3d23d4e064d44f506a7744cdfa5eae0421c469275c4ed511ff088b68fc7cfa666e1dd6e5e1df474280df8d27028c8d675c0b4abdace0cff46701c14f WHIRLPOOL f7c6947c7cf06438a1142d40f1eb2b79310096623f9d5b16e2bfcc6c7140b3c6b859939bbc5af501138162a4cc38b14d8de480e6f79d539589692cd0c7d3ca3b
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST=""
|
||||
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||
RUBY_FAKEGEM_EXTRADOC="README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Creates a version constraint of supported Rubies,suitable for a gemspec file"
|
||||
HOMEPAGE="https://github.com/e2/ruby_dep"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="1"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
@ -1,2 +1,3 @@
|
||||
DIST hevea-2.03.tar.gz 385865 SHA256 d927f538b47935f8b6cf34a817071195dfeb5da05debfd55ab47253c7868dab5 SHA512 dcb30992ff74935d92e6fdc4710bf8ee3b555e094673557e697531c3bff7155d6577349e2d80de21180abe5ea8d0ac1b4eaffcf217736477a33d8895ebd1aacc WHIRLPOOL 9d5c7a8cfb3f2fcffb90c09c0bfb43d50c0a7cd4cad8073de2b9640365e16613b202c76e8b35993f1a5dcecd7a215091597587a854fc8a8ff742ad0e04656e8e
|
||||
DIST hevea-2.28.tar.gz 969507 SHA256 cde2000e4642f3f88d73a317aec54e8b6036e29e81a00262daf15aca47d0d691 SHA512 9df1ab91d9c15952f3b2f5b7aa8a56e24160b6447c4a6e29ba8093cb70565400d40ae840c0077c0f16249bea673b9a3ca9c9e8a0b34b272d4dffc97d3482b033 WHIRLPOOL 6c483f0627bca8d405b79129463b3510cfc463080f9d8908e7b98024899fc665444122271e06e70b253e5b0ceb17aed66e74e9364f97d427e5c087ad33a890e9
|
||||
DIST hevea-2.29.tar.gz 969599 SHA256 06bf0b01834a25358415c666a0a477effc12eeeb1da4da1eeefaca67b29af8c4 SHA512 4ea2f3d60fd43d183712a868cb3894b38f6d9809ba7905d69123a7672faba0d6dfe73ad1379d7996ede98ceb645bba903e5b7550bdf92e7950ce69ba7f4f3994 WHIRLPOOL e336c088d862442d3b44acaeec19064c69ecf2c6bb1c1e50822e383b03b90201d9eced19f234f3ea07de47c8cdfd0e9447cc276aac4f5a946285552c994a258e
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils multilib
|
||||
|
||||
IUSE="+ocamlopt"
|
||||
|
||||
DESCRIPTION="HeVeA is a quite complete and fast LaTeX to HTML translator"
|
||||
HOMEPAGE="http://hevea.inria.fr/"
|
||||
SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
|
||||
|
||||
LICENSE="QPL"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
|
||||
RDEPEND="${DEPEND}
|
||||
dev-texlive/texlive-latexextra"
|
||||
DEPEND="${DEPEND} dev-ml/ocamlbuild"
|
||||
|
||||
src_compile() {
|
||||
rm -f config.sh
|
||||
emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
|
||||
if use ocamlopt; then
|
||||
emake PREFIX=/usr || die "Failed to build native code binaries"
|
||||
else
|
||||
emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use ocamlopt; then
|
||||
emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
|
||||
else
|
||||
emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
|
||||
fi
|
||||
|
||||
dodoc README CHANGES
|
||||
}
|
||||
|
||||
# If texmf-update is present this means we have a latex install; update it so
|
||||
# that hevea.sty can be found
|
||||
# Do not (r)depend on latex though because hevea does not need it itself
|
||||
# If latex is installed later, it will see hevea.sty
|
||||
|
||||
pkg_postinst() {
|
||||
if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
|
||||
/usr/sbin/texmf-update
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
if [ "$ROOT" = "/" ] && [ -x /usr/sbin/texmf-update ] ; then
|
||||
/usr/sbin/texmf-update
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST llgal-0.13.17.tar.bz2 81365 SHA256 86c8a35ec3387ecfb69d3695611f384ce6cf4189ded02668c59c9e35e00390ce SHA512 2b100053a804985e7f59674e6a0886bffe5231cf3735a8dbbf7c8db56285a5a4ca88880299aac25d5cecb6a4f0cc024dc87fdf084eb281f7cb578f0d7cba5293 WHIRLPOOL 216b7dc933f72a0419579b71884f5e9e7084e0f5e1427d5d66b432adad108eb648c0d4a61c62d8ab5dbba0aa7ca0b3b4b3df4814f99aaec0271276c32b62f109
|
||||
DIST llgal-0.13.18.tar.bz2 81674 SHA256 362d52763c4abcd00e79db868ee4f496dfb22b0c884fb552d37cf26dcc40c225 SHA512 d01c1060616bb602af8b75aa5ae04384c19ed4bcc717112b9d5cfe48a9a823ce9ba381d675b4f4e89f35a56d7cbf580f27405fcb65b785e8ea6b6732784b0655 WHIRLPOOL 2953b277a693b94fa872455a180454d69d2f7b7498226f1463d07ce0d9251fafdc0f1ca9c439526722ea1030c9e737fafb537e1453257a4917848416b6ba0f4f
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Command-line static web gallery generator"
|
||||
HOMEPAGE="http://home.gna.org/llgal"
|
||||
SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
# Package warrants IUSE doc and possibly examples
|
||||
IUSE="exif"
|
||||
|
||||
LINS="de en it fr"
|
||||
for i in ${LINS}; do
|
||||
IUSE="${IUSE} linguas_${i}"
|
||||
done
|
||||
|
||||
RDEPEND="media-gfx/imagemagick
|
||||
dev-perl/Image-Size
|
||||
dev-perl/URI
|
||||
dev-perl/Locale-gettext
|
||||
exif? ( media-libs/exiftool )"
|
||||
|
||||
src_compile() {
|
||||
emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
|
||||
mv doc/llgalrc . || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
|
||||
PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
|
||||
install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
|
||||
perl_delete_localpod
|
||||
dodoc README llgalrc llgalrc.5
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST alsa-lib-1.0.29.tar.bz2 905417 SHA256 73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0 SHA512 c9c2dcd3105abadcfdff104770a1f7683d83f6b9df64eebe9f9efc1ecab3ca4cef43718b5b15526bdabf2862ce55ec665732bb0390fc8e6492e2c1cebec9294c WHIRLPOOL 330877960733e847c12f133f93acc58a2053303b4437c5aaf21e2c4df0c47389df28ed093ab6606ee3cb854389b359d981dc547fba08bab03cff1c99f93e72d8
|
||||
DIST alsa-lib-1.1.0.tar.bz2 929874 SHA256 dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15 SHA512 2939d0b621c1c619b0a492b05f2e84f354d588c9cc982d93dbcf01c582319258dd5f803ff5c10be52343cd8827d690f671ab5b20ad586a0ee371f0949c9e98f4 WHIRLPOOL b82bdf72ed5cd23517270a1e81407670d2af2794fa14decf9513643f270281affe978eef9bc61cd76eea529751461ab016fc0e187b36e2527bec02674e5ee8a8
|
||||
DIST alsa-lib-1.1.1.tar.bz2 932105 SHA256 8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269 SHA512 dacd0a74adc682ac0034cbeba2de3d1a141e0ac2e564c9e04dae202ffaf87ef3a1e01307afc2fd2d9cfe679e5b101c379f9b6ea5f7ccceeed14a427bd5232bc7 WHIRLPOOL c383ee51592e87c08a1bb25e358482afe6116b4feaf45121296fb887e77c930fb3b8e864f3265bf7bd4c57227fdcbc71994031bb9356621d69de7a252bed65a4
|
||||
DIST alsa-lib-1.1.2.tar.bz2 947423 SHA256 d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6 SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a WHIRLPOOL 7aa68f305cb5ad58e9bdaeb3eee5fa7a37e9f606640789a9c778ff1bfd9b458d80e6ccfa9f73f9ad5b3a229ea988fa9b6d64b929c87f64ea9376a778f30eed0d
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST alsa-utils-1.0.29.tar.bz2 1154497 SHA256 5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b SHA512 0d83805aa7b1c975524cc5ecd4aa6eb36126bc434458f9e9475e4bd1b14bbb4bf9691096ca7973342a3798e97a361451c078f4595f8f4275db64d6b443ca5928 WHIRLPOOL ccad5115148045e0c5f139d70306e801e250aa3946f60d9cd0a47c84c72f6d8689e53105030589309c98ddd4a7b871bb8dc03f00fcc3d46cc3e08c4718299407
|
||||
DIST alsa-utils-1.1.0.tar.bz2 1181085 SHA256 3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1 SHA512 c61f056959feba015bb4a6f49980c4beb6a0c34be09e7196864583897ea86373b593a8807999a07df9c87a3a0c714075b9aae516752e83a946d0d60bc8f90f98 WHIRLPOOL 50d8e1506fb9f969b3dfcd618933efbeda6f938c3350eccf99526fb8329afd1ea4381ff1a548590f0f9bae12bdb63c1e8ab068641743d52b3ba609eae2d337e5
|
||||
DIST alsa-utils-1.1.1.tar.bz2 1186408 SHA256 89757c9abaf420831b088fce354d492acc170bd02bb50eb7392c175f594b8041 SHA512 3af1e43cb2eab7e5119d83036ab6f4eeb106b66b4a57122cc8df243b6dbda90d39a0290a2af3a904b4929e2d90e8fcded9eda2a38bae1fd8e371a6d7a043376e WHIRLPOOL ea7daaf4055469dd5cb128abbe9a986e2b99b27c59d964041a92e82667e520adadb1e87d38bfa83d5b8ffbc382d7d9401c9d4887ca19546e4d1f34ba1cf7d705
|
||||
DIST alsa-utils-1.1.2.tar.bz2 1193140 SHA256 7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0519071 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14 WHIRLPOOL 353d636271fd4354e7a7b986c08a3eabdb91bb8239b3d14a2163dea095dee010cd777276901c11df58a4fcba24680770512df4784e446a63941224f9ee79f632
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 03 Aug 2016 05:40:34 +0000
|
||||
Wed, 03 Aug 2016 10:40:39 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 03 Aug 2016 05:40:35 +0000
|
||||
Wed, 03 Aug 2016 10:40:39 +0000
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm prepare setup test
|
||||
DEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0 media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
|
||||
DESCRIPTION=Desktop publishing (DTP) and layout program
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.scribus.net/
|
||||
IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk linguas_af linguas_ar linguas_bg linguas_br linguas_ca linguas_ca_ES linguas_cs linguas_cs_CZ linguas_cy linguas_cy_GB linguas_da linguas_da_DK linguas_de linguas_de_1901 linguas_de_CH linguas_de_DE linguas_el linguas_en_AU linguas_en_EN linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fi_FI linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_hu_HU linguas_ia linguas_id linguas_id_ID linguas_is linguas_is_IS linguas_it linguas_ja linguas_ko linguas_ku linguas_la linguas_lt linguas_lt_LT linguas_nb_NO linguas_nl linguas_nn_NO linguas_pl linguas_pl_PL linguas_pt linguas_pt_BR linguas_pt_PT linguas_ro linguas_ro_RO linguas_ru linguas_ru_RU_0 linguas_sa linguas_sk linguas_sk_SK linguas_sl linguas_sl_SI linguas_sq linguas_sr linguas_sv linguas_sv_SE linguas_th_TH linguas_tr linguas_uk linguas_uk_UA linguas_zh_CN linguas_zh_TW python_targets_python2_7
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/libmspub >=app-text/poppler-0.19.0:= dev-libs/boost dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0 media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( dev-libs/boost ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
|
||||
REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.1/scribus-1.5.1.tar.xz
|
||||
_eclasses_=cmake-utils ac5bd012586c6cf0d9826400d9de2830 eutils 792f83d5ec9536cb5ccef375469d8bde fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib d062ae4ba2fc40a19c11de2ad89b6616 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 c0ed2a2f233d3af6dd556048695dc5cb toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=352e1298edadccef91dc26904fd37b81
|
||||
@ -1,13 +1,13 @@
|
||||
DEFINED_PHASES=compile install postinst postrm setup test
|
||||
DEPEND=>=dev-libs/girara-0.2.5:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
|
||||
DEPEND=>=dev-libs/girara-0.2.6:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
|
||||
DESCRIPTION=A highly customizable and functional document viewer
|
||||
EAPI=5
|
||||
HOMEPAGE=http://pwmt.org/projects/zathura/
|
||||
IUSE=+magic sqlite synctex test test
|
||||
KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
|
||||
LICENSE=ZLIB
|
||||
RDEPEND=>=dev-libs/girara-0.2.5:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
|
||||
RDEPEND=>=dev-libs/girara-0.2.6:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
|
||||
SLOT=0
|
||||
SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.3.6.tar.gz
|
||||
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde fdo-mime 92d07846ea8ea54172f8c0112a47ae3d multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs 82165206dedb2075f9a0fb8f9b1f9441 virtualx 86c9305a59b3e0459e7fbef3a5f30b96
|
||||
_md5_=87a6499794a7456d6972a8b7901ea757
|
||||
_md5_=6057e3e3a9f1bf4fd4dbc17338b13a99
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=install postinst postrm
|
||||
DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: library for simplifying indent files
|
||||
EAPI=0
|
||||
HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=678
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
|
||||
LICENSE=vim
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
|
||||
_md5_=0533c2c0c36878535de62e2ffa8e55f8
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue