Hello community, here is the log from the commit of package ghc-dbus for openSUSE:Leap:15.2 checked in at 2020-05-18 10:59:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ghc-dbus (Old) and /work/SRC/openSUSE:Leap:15.2/.ghc-dbus.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-dbus" Mon May 18 10:59:10 2020 rev:14 rq:805970 version:1.2.14 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ghc-dbus/ghc-dbus.changes 2020-03-13 10:57:14.244428785 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ghc-dbus.new.2738/ghc-dbus.changes 2020-05-18 10:59:17.326623355 +0200 @@ -1,0 +2,6 @@ +Wed May 6 06:54:12 UTC 2020 - [email protected] + +- Update dbus to version 1.2.14. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- dbus-1.2.11.tar.gz New: ---- dbus-1.2.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-dbus.spec ++++++ --- /var/tmp/diff_new_pack.GF6twv/_old 2020-05-18 10:59:17.666624059 +0200 +++ /var/tmp/diff_new_pack.GF6twv/_new 2020-05-18 10:59:17.666624059 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-dbus # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name dbus %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.11 +Version: 1.2.14 Release: 0 Summary: A client library for the D-Bus IPC system License: Apache-2.0 @@ -76,14 +76,14 @@ import Data.List (sort) import DBus import DBus.Client -main = do   client <- connectSession   //   -- Request a list of +main = do   client <- connectSession     -- Request a list of connected clients from the bus   reply <- call_ client (methodCall "/org/freedesktop/DBus" "org.freedesktop.DBus" "ListNames")   { -methodCallDestination = Just "org.freedesktop.DBus"   }   // -  -- org.freedesktop.DBus.ListNames() returns a single value, which is -  -- a list of names (here represented as [String])   let Just names -= fromVariant (methodReturnBody reply !! 0)   //   -- Print each name -on a line, sorted so reserved names are below   -- temporary names. +methodCallDestination = Just "org.freedesktop.DBus"   }     +-- org.freedesktop.DBus.ListNames() returns a single value, which is   -- +a list of names (here represented as [String])   let Just names = +fromVariant (methodReturnBody reply !! 0)     -- Print each name on a +line, sorted so reserved names are below   -- temporary names.   mapM_ putStrLn (sort names) ' >$ ghc --make list-names.hs >$ ./list-names >:1.0 >:1.1 >:1.10 >:1.106 >:1.109 @@ -102,7 +102,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cabal-tweak-dep-ver lens '<4.19' '< 5' %build %ghc_lib_build ++++++ dbus-1.2.11.tar.gz -> dbus-1.2.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/dbus.cabal new/dbus-1.2.14/dbus.cabal --- old/dbus-1.2.11/dbus.cabal 2019-10-05 04:15:53.000000000 +0200 +++ new/dbus-1.2.14/dbus.cabal 2020-04-28 04:55:31.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: >=1.8 name: dbus -version: 1.2.11 +version: 1.2.14 license: Apache-2.0 license-file: license.txt maintainer: Andrey Sverdlichenko <[email protected]> @@ -31,18 +31,18 @@ . main = do   client <- connectSession -   // -   \-- Request a list of connected clients from the bus +   +   -- Request a list of connected clients from the bus   reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")   { methodCallDestination = Just \"org.freedesktop.DBus\"   } -   // -   \-- org.freedesktop.DBus.ListNames() returns a single value, which is -   \-- a list of names (here represented as [String]) +   +   -- org.freedesktop.DBus.ListNames() returns a single value, which is +   -- a list of names (here represented as [String])   let Just names = fromVariant (methodReturnBody reply !! 0) -   // -   \-- Print each name on a line, sorted so reserved names are below -   \-- temporary names. +   +   -- Print each name on a line, sorted so reserved names are below +   -- temporary names.   mapM_ putStrLn (sort names) @ . @@ -99,12 +99,12 @@ deepseq <1.5, exceptions <0.11, filepath <1.5, - lens <4.19, + lens <4.20, network >=3.0.1.0 && <3.2, parsec <3.2, random <1.2, split <0.3, - template-haskell <2.16.0.0, + template-haskell <2.17.0.0, text <1.3, th-lift <0.9, transformers <0.6, @@ -145,12 +145,12 @@ cereal <0.6, containers <0.7, directory <1.4, - extra <1.7, + extra <1.8, filepath <1.5, network >=3.0.1.0 && <3.2, parsec <3.2, process <1.7, - QuickCheck <2.14, + QuickCheck <2.15, random <1.2, resourcet <1.3, tasty <1.3, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/lib/DBus/Client.hs new/dbus-1.2.14/lib/DBus/Client.hs --- old/dbus-1.2.11/lib/DBus/Client.hs 2018-12-08 02:16:42.000000000 +0100 +++ new/dbus-1.2.14/lib/DBus/Client.hs 2020-04-27 04:35:18.000000000 +0200 @@ -400,7 +400,7 @@ connectSession = do env <- getSessionAddress case env of - Nothing -> throwIO (clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is missing or invalid.") + Nothing -> throwIO (clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is invalid.") Just addr -> connect addr -- | Connect to the bus specified in the environment variable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/lib/DBus/Generation.hs new/dbus-1.2.14/lib/DBus/Generation.hs --- old/dbus-1.2.11/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 +++ new/dbus-1.2.14/lib/DBus/Generation.hs 2020-04-27 04:53:53.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} module DBus.Generation where @@ -26,6 +27,13 @@ import Prelude hiding (mapM) import System.Posix.Types (Fd(..)) +-- | Compatibility helper to create (total) tuple expressions +mkTupE :: [Exp] -> Exp +mkTupE = TupE +#if MIN_VERSION_template_haskell(2,16,0) + . map Just +#endif + type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a @@ -232,8 +240,8 @@ finalOutputNames <- buildOutputNames let variantListExp = map makeToVariantApp methodArgNames mapOrHead' = mapOrHead outputLength - fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE - finalResultTuple = mapOrHead' VarE finalOutputNames TupE + fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE + finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP getMethodCallDefDec = [d| $( varP methodCallDefN ) = @@ -432,7 +440,7 @@ } |] let mapOrHead' = mapOrHead argCount - fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE + fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP applyToName toApply n = AppE toApply $ VarE n finalApplication = foldl applyToName (VarE handlerArgN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/lib/DBus/Internal/Address.hs new/dbus-1.2.14/lib/DBus/Internal/Address.hs --- old/dbus-1.2.11/lib/DBus/Internal/Address.hs 2019-10-05 03:52:42.000000000 +0200 +++ new/dbus-1.2.14/lib/DBus/Internal/Address.hs 2020-04-27 04:35:18.000000000 +0200 @@ -1,3 +1,4 @@ +{-# Language LambdaCase #-} -- Copyright (C) 2009-2012 John Millikin <[email protected]> -- -- Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,13 +15,12 @@ module DBus.Internal.Address where -import qualified Control.Exception import Data.Char (digitToInt, ord, chr) -import Data.Maybe (listToMaybe) +import Data.Maybe (listToMaybe, fromMaybe) import Data.List (intercalate) import qualified Data.Map import Data.Map (Map) -import qualified System.Environment +import System.Environment (lookupEnv) import Text.Printf (printf) import Text.ParserCombinators.Parsec @@ -141,18 +141,20 @@ getSystemAddress :: IO (Maybe Address) getSystemAddress = do let system = "unix:path=/var/run/dbus/system_bus_socket" - env <- getenv "DBUS_SYSTEM_BUS_ADDRESS" - return (parseAddress (maybe system id env)) + env <- lookupEnv "DBUS_SYSTEM_BUS_ADDRESS" + return (parseAddress (fromMaybe system env)) -- | Returns the first address in the environment variable -- @DBUS_SESSION_BUS_ADDRESS@, which must be set. -- --- Returns 'Nothing' if @DBUS_SYSTEM_BUS_ADDRESS@ is unset or contains an --- invalid address. +-- Returns 'Nothing' if @DBUS_SYSTEM_BUS_ADDRESS@ contains an invalid address +-- or @DBUS_SYSTEM_BUS_ADDRESS@ is unset @XDG_RUNTIME_DIR@ doesn't have @/bus@. getSessionAddress :: IO (Maybe Address) -getSessionAddress = do - env <- getenv "DBUS_SESSION_BUS_ADDRESS" - return (env >>= parseAddresses >>= listToMaybe) +getSessionAddress = lookupEnv "DBUS_SESSION_BUS_ADDRESS" >>= \case + Just addrs -> pure (parseAddresses addrs >>= listToMaybe) + Nothing -> (>>= parseFallback) <$> lookupEnv "XDG_RUNTIME_DIR" + where + parseFallback dir = parseAddress ("unix:path=" ++ dir ++ "/bus") -- | Returns the address in the environment variable -- @DBUS_STARTER_ADDRESS@, which must be set. @@ -161,14 +163,9 @@ -- invalid address. getStarterAddress :: IO (Maybe Address) getStarterAddress = do - env <- getenv "DBUS_STARTER_ADDRESS" + env <- lookupEnv "DBUS_STARTER_ADDRESS" return (env >>= parseAddress) -getenv :: String -> IO (Maybe String) -getenv name = Control.Exception.catch - (fmap Just (System.Environment.getEnv name)) - (\(Control.Exception.SomeException _) -> return Nothing) - hexToInt :: String -> Int hexToInt = foldl ((+) . (16 *)) 0 . map digitToInt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/lib/DBus/Internal/Types.hs new/dbus-1.2.14/lib/DBus/Internal/Types.hs --- old/dbus-1.2.11/lib/DBus/Internal/Types.hs 2018-12-08 02:16:42.000000000 +0100 +++ new/dbus-1.2.14/lib/DBus/Internal/Types.hs 2020-04-27 04:35:18.000000000 +0200 @@ -310,7 +310,7 @@ extractFromVariant v = fromVariant v typeOf :: forall a. IsValue a => a -> Type -typeOf _ = typeOf' (Proxy :: Proxy a) +typeOf _ = typeOf_ (Proxy :: Proxy a) class IsVariant a where toVariant :: a -> Variant @@ -322,7 +322,7 @@ -- Users may not provide new instances of 'IsValue' because this could allow -- containers to be created with items of heterogenous types. class IsVariant a => IsValue a where - typeOf' :: Proxy a -> Type + typeOf_ :: Proxy a -> Type toValue :: a -> Value fromValue :: Value -> Maybe a @@ -456,7 +456,7 @@ ; fromAtom _ = Nothing \ }; \ instance IsValue HsType where \ - { typeOf' _ = TypeCons \ + { typeOf_ _ = TypeCons \ ; toValue = ValueAtom . toAtom \ ; fromValue (ValueAtom x) = fromAtom x \ ; fromValue _ = Nothing \ @@ -481,7 +481,7 @@ IS_ATOM(ObjectPath, AtomObjectPath, TypeObjectPath) instance IsValue Variant where - typeOf' _ = TypeVariant + typeOf_ _ = TypeVariant toValue = ValueVariant fromValue (ValueVariant x) = Just x fromValue _ = Nothing @@ -495,7 +495,7 @@ fromAtom = fmap Data.Text.Lazy.fromStrict . fromAtom instance IsValue Data.Text.Lazy.Text where - typeOf' _ = TypeString + typeOf_ _ = TypeString toValue = ValueAtom . toAtom fromValue (ValueAtom x) = fromAtom x fromValue _ = Nothing @@ -509,7 +509,7 @@ fromAtom = fmap Data.Text.unpack . fromAtom instance IsValue String where - typeOf' _ = TypeString + typeOf_ _ = TypeString toValue = ValueAtom . toAtom fromValue (ValueAtom x) = fromAtom x fromValue _ = Nothing @@ -519,9 +519,9 @@ fromVariant (Variant val) = fromValue val instance IsValue a => IsValue (Vector a) where - typeOf' _ = TypeArray (typeOf' (Proxy :: Proxy a)) + typeOf_ _ = TypeArray (typeOf_ (Proxy :: Proxy a)) toValue v = ValueVector - (typeOf' (Proxy :: Proxy a)) + (typeOf_ (Proxy :: Proxy a)) (Data.Vector.map toValue v) fromValue (ValueVector _ v) = Data.Vector.mapM fromValue v fromValue _ = Nothing @@ -531,7 +531,7 @@ fromVariant (Variant val) = fromValue val instance IsValue a => IsValue [a] where - typeOf' _ = TypeArray (typeOf' (Proxy :: Proxy a)) + typeOf_ _ = TypeArray (typeOf_ (Proxy :: Proxy a)) toValue = toValue . Data.Vector.fromList fromValue = fmap Data.Vector.toList . fromValue @@ -540,7 +540,7 @@ fromVariant = fmap Data.Vector.toList . fromVariant instance IsValue BS.ByteString where - typeOf' _ = TypeArray TypeWord8 + typeOf_ _ = TypeArray TypeWord8 toValue = ValueBytes fromValue (ValueBytes bs) = Just bs fromValue (ValueVector TypeWord8 v) = Just (vectorToBytes v) @@ -551,7 +551,7 @@ fromVariant (Variant val) = fromValue val instance IsValue BL.ByteString where - typeOf' _ = TypeArray TypeWord8 + typeOf_ _ = TypeArray TypeWord8 toValue = toValue . BS.concat . BL.toChunks @@ -563,13 +563,13 @@ fromVariant (Variant val) = fromValue val instance (Ord k, IsAtom k, IsValue v) => IsValue (Map k v) where - typeOf' _ = TypeDictionary - (typeOf' (Proxy :: Proxy k)) - (typeOf' (Proxy :: Proxy v)) + typeOf_ _ = TypeDictionary + (typeOf_ (Proxy :: Proxy k)) + (typeOf_ (Proxy :: Proxy v)) toValue m = ValueMap kt vt (bimap box m) where - kt = typeOf' (Proxy :: Proxy k) - vt = typeOf' (Proxy :: Proxy v) + kt = typeOf_ (Proxy :: Proxy k) + vt = typeOf_ (Proxy :: Proxy v) box k v = (toAtom k, toValue v) fromValue (ValueMap _ _ m) = bimapM unbox m where @@ -590,7 +590,7 @@ fromVariant (Variant val) = fromValue val instance IsValue () where - typeOf' _ = TypeStructure [] + typeOf_ _ = TypeStructure [] toValue _ = ValueStructure [] fromValue (ValueStructure []) = return () fromValue _ = Nothing @@ -601,9 +601,9 @@ fromVariant _ = Nothing instance (IsValue a1, IsValue a2) => IsValue (a1, a2) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) ] toValue (a1, a2) = ValueStructure [toValue a1, toValue a2] fromValue (ValueStructure [a1, a2]) = do @@ -912,10 +912,10 @@ return (Variant (ValueAtom k), Variant v) instance (IsValue a1, IsValue a2, IsValue a3) => IsValue (a1, a2, a3) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) ] toValue (a1, a2, a3) = ValueStructure [toValue a1, toValue a2, toValue a3] fromValue (ValueStructure [a1, a2, a3]) = do @@ -926,11 +926,11 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4) => IsValue (a1, a2, a3, a4) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) ] toValue (a1, a2, a3, a4) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4] fromValue (ValueStructure [a1, a2, a3, a4]) = do @@ -942,12 +942,12 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5) => IsValue (a1, a2, a3, a4, a5) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) ] toValue (a1, a2, a3, a4, a5) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5] fromValue (ValueStructure [a1, a2, a3, a4, a5]) = do @@ -960,13 +960,13 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6) => IsValue (a1, a2, a3, a4, a5, a6) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) ] toValue (a1, a2, a3, a4, a5, a6) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6]) = do @@ -980,14 +980,14 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7) => IsValue (a1, a2, a3, a4, a5, a6, a7) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) ] toValue (a1, a2, a3, a4, a5, a6, a7) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7]) = do @@ -1002,15 +1002,15 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8]) = do @@ -1026,16 +1026,16 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9]) = do @@ -1052,17 +1052,17 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) - , typeOf' (Proxy :: Proxy a10) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) + , typeOf_ (Proxy :: Proxy a10) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10]) = do @@ -1080,18 +1080,18 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) - , typeOf' (Proxy :: Proxy a10) - , typeOf' (Proxy :: Proxy a11) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) + , typeOf_ (Proxy :: Proxy a10) + , typeOf_ (Proxy :: Proxy a11) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11]) = do @@ -1110,19 +1110,19 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) - , typeOf' (Proxy :: Proxy a10) - , typeOf' (Proxy :: Proxy a11) - , typeOf' (Proxy :: Proxy a12) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) + , typeOf_ (Proxy :: Proxy a10) + , typeOf_ (Proxy :: Proxy a11) + , typeOf_ (Proxy :: Proxy a12) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12]) = do @@ -1142,20 +1142,20 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12, IsValue a13) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) - , typeOf' (Proxy :: Proxy a10) - , typeOf' (Proxy :: Proxy a11) - , typeOf' (Proxy :: Proxy a12) - , typeOf' (Proxy :: Proxy a13) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) + , typeOf_ (Proxy :: Proxy a10) + , typeOf_ (Proxy :: Proxy a11) + , typeOf_ (Proxy :: Proxy a12) + , typeOf_ (Proxy :: Proxy a13) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12, toValue a13] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13]) = do @@ -1176,21 +1176,21 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12, IsValue a13, IsValue a14) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) - , typeOf' (Proxy :: Proxy a10) - , typeOf' (Proxy :: Proxy a11) - , typeOf' (Proxy :: Proxy a12) - , typeOf' (Proxy :: Proxy a13) - , typeOf' (Proxy :: Proxy a14) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) + , typeOf_ (Proxy :: Proxy a10) + , typeOf_ (Proxy :: Proxy a11) + , typeOf_ (Proxy :: Proxy a12) + , typeOf_ (Proxy :: Proxy a13) + , typeOf_ (Proxy :: Proxy a14) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12, toValue a13, toValue a14] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14]) = do @@ -1212,22 +1212,22 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12, IsValue a13, IsValue a14, IsValue a15) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) where - typeOf' _ = TypeStructure - [ typeOf' (Proxy :: Proxy a1) - , typeOf' (Proxy :: Proxy a2) - , typeOf' (Proxy :: Proxy a3) - , typeOf' (Proxy :: Proxy a4) - , typeOf' (Proxy :: Proxy a5) - , typeOf' (Proxy :: Proxy a6) - , typeOf' (Proxy :: Proxy a7) - , typeOf' (Proxy :: Proxy a8) - , typeOf' (Proxy :: Proxy a9) - , typeOf' (Proxy :: Proxy a10) - , typeOf' (Proxy :: Proxy a11) - , typeOf' (Proxy :: Proxy a12) - , typeOf' (Proxy :: Proxy a13) - , typeOf' (Proxy :: Proxy a14) - , typeOf' (Proxy :: Proxy a15) + typeOf_ _ = TypeStructure + [ typeOf_ (Proxy :: Proxy a1) + , typeOf_ (Proxy :: Proxy a2) + , typeOf_ (Proxy :: Proxy a3) + , typeOf_ (Proxy :: Proxy a4) + , typeOf_ (Proxy :: Proxy a5) + , typeOf_ (Proxy :: Proxy a6) + , typeOf_ (Proxy :: Proxy a7) + , typeOf_ (Proxy :: Proxy a8) + , typeOf_ (Proxy :: Proxy a9) + , typeOf_ (Proxy :: Proxy a10) + , typeOf_ (Proxy :: Proxy a11) + , typeOf_ (Proxy :: Proxy a12) + , typeOf_ (Proxy :: Proxy a13) + , typeOf_ (Proxy :: Proxy a14) + , typeOf_ (Proxy :: Proxy a15) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12, toValue a13, toValue a14, toValue a15] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15]) = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/lib/DBus.hs new/dbus-1.2.14/lib/DBus.hs --- old/dbus-1.2.11/lib/DBus.hs 2018-12-08 02:16:42.000000000 +0100 +++ new/dbus-1.2.14/lib/DBus.hs 2020-04-27 04:35:18.000000000 +0200 @@ -180,7 +180,7 @@ import DBus.Internal.Address import DBus.Internal.Message import qualified DBus.Internal.Types -import DBus.Internal.Types hiding (typeOf, typeOf') +import DBus.Internal.Types hiding (typeOf) import DBus.Internal.Wire -- | Deprecated. Get the D-Bus type corresponding to the given Haskell value. The value @@ -190,7 +190,7 @@ -- | Get the D-Bus type corresponding to the given Haskell type 'a'. typeOf' :: IsValue a => Proxy a -> Type -typeOf' = DBus.Internal.Types.typeOf' +typeOf' = DBus.Internal.Types.typeOf_ -- | Construct a new 'MethodCall' for the given object, interface, and method. -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.11/tests/DBusTests/Client.hs new/dbus-1.2.14/tests/DBusTests/Client.hs --- old/dbus-1.2.11/tests/DBusTests/Client.hs 2018-12-02 02:37:38.000000000 +0100 +++ new/dbus-1.2.14/tests/DBusTests/Client.hs 2020-04-27 04:35:18.000000000 +0200 @@ -102,9 +102,8 @@ test_ConnectSession_NoAddress :: TestTree test_ConnectSession_NoAddress = testCase "connectSession-no-address" $ assertException - (DBus.Client.clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is missing or invalid.") - (withEnv "DBUS_SESSION_BUS_ADDRESS" - (Just "invalid") + (DBus.Client.clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is invalid.") + (withEnv "DBUS_SESSION_BUS_ADDRESS" (Just "invalid") DBus.Client.connectSession) test_ConnectStarter :: TestTree
