New patches: [make plugins build with ghc-6.9 (darcs version) "Valery V. Vorotyntsev" **20080114143447 + PackageAPI.hs (updImportDirs): `InstalledPackageInfo_' is the proper name + Load.hs: `PackageConfig' does not export `packageIdString', `Module' does + PackageAPI.hs, Load.hs: cleaned of trailing whitespace ] { hunk ./src/System/Plugins/Load.hs 4 --- +-- hunk ./src/System/Plugins/Load.hs 9 --- +-- hunk ./src/System/Plugins/Load.hs 14 --- +-- hunk ./src/System/Plugins/Load.hs 19 --- +-- hunk ./src/System/Plugins/Load.hs 34 - , pdynload + , pdynload hunk ./src/System/Plugins/Load.hs 72 -import Module (moduleName, moduleNameString) -import PackageConfig (packageIdString) +import Module (moduleName, moduleNameString, packageIdString) hunk ./src/System/Plugins/Load.hs 131 --- +-- hunk ./src/System/Plugins/Load.hs 166 - return $ case v of + return $ case v of hunk ./src/System/Plugins/Load.hs 186 -dynload :: Typeable a - => FilePath +dynload :: Typeable a + => FilePath hunk ./src/System/Plugins/Load.hs 219 -pdynload object incpaths pkgconfs ty sym = do +pdynload object incpaths pkgconfs ty sym = do hunk ./src/System/Plugins/Load.hs 227 - if null errors + if null errors hunk ./src/System/Plugins/Load.hs 251 - if null errors + if null errors hunk ./src/System/Plugins/Load.hs 272 - let nm = mkModid (basename tmpf) + let nm = mkModid (basename tmpf) hunk ./src/System/Plugins/Load.hs 294 -mkTest modnm plugin api ty sym = +mkTest modnm plugin api ty sym = hunk ./src/System/Plugins/Load.hs 309 - if ty == ty' + if ty == ty' hunk ./src/System/Plugins/Load.hs 313 - where + where hunk ./src/System/Plugins/Load.hs 330 -dynload2 :: Typeable a => - FilePath -> - FilePath -> +dynload2 :: Typeable a => + FilePath -> + FilePath -> hunk ./src/System/Plugins/Load.hs 334 - Symbol -> + Symbol -> hunk ./src/System/Plugins/Load.hs 384 - + hunk ./src/System/Plugins/Load.hs 390 - return $ case v of + return $ case v of hunk ./src/System/Plugins/Load.hs 471 --- +-- hunk ./src/System/Plugins/Load.hs 488 -loadObject p ky@(Object k) = loadObject' p ky k -loadObject p ky@(Package k) = loadObject' p ky k +loadObject p ky@(Object k) = loadObject' p ky k +loadObject p ky@(Package k) = loadObject' p ky k hunk ./src/System/Plugins/Load.hs 495 - | otherwise + | otherwise hunk ./src/System/Plugins/Load.hs 538 -unloadObj :: Module -> IO () +unloadObj :: Module -> IO () hunk ./src/System/Plugins/Load.hs 542 - when (removed) $ do r <- c_unloadObj c_p + when (removed) $ do r <- c_unloadObj c_p hunk ./src/System/Plugins/Load.hs 557 - if maybe_errmsg == nullPtr + if maybe_errmsg == nullPtr hunk ./src/System/Plugins/Load.hs 603 - r <- c_unloadObj c_p + r <- c_unloadObj c_p hunk ./src/System/Plugins/Load.hs 605 - rmModule (mkModid p) -- unrecord this module + rmModule (mkModid p) -- unrecord this module hunk ./src/System/Plugins/Load.hs 622 - + hunk ./src/System/Plugins/Load.hs 662 - let mods_ = map (\s -> (s, map (\c -> + let mods_ = map (\s -> (s, map (\c -> hunk ./src/System/Plugins/Load.hs 666 - let mods = concatMap (\p -> + let mods = concatMap (\p -> hunk ./src/System/Plugins/Load.hs 691 - when (not (null ps')) $ putStrLn "done" - putStr "Loading object" + when (not (null ps')) $ putStrLn "done" + putStr "Loading object" hunk ./src/System/Plugins/PackageAPI.hs 3 --- +-- hunk ./src/System/Plugins/PackageAPI.hs 8 --- +-- hunk ./src/System/Plugins/PackageAPI.hs 13 --- +-- hunk ./src/System/Plugins/PackageAPI.hs 36 - , updLibraryDirs + , updLibraryDirs hunk ./src/System/Plugins/PackageAPI.hs 48 -packageName :: PackageConfig -> PackageName +packageName :: PackageConfig -> PackageName hunk ./src/System/Plugins/PackageAPI.hs 64 -updImportDirs f pk@(InstalledPackageInfo { importDirs = idirs }) = +updImportDirs f pk@(InstalledPackageInfo_ { importDirs = idirs }) = hunk ./src/System/Plugins/PackageAPI.hs 66 -updLibraryDirs f pk@(InstalledPackageInfo { libraryDirs = ldirs }) = +updLibraryDirs f pk@(InstalledPackageInfo_ { libraryDirs = ldirs }) = hunk ./src/System/Plugins/PackageAPI.hs 74 -updImportDirs f pk@(Package {import_dirs = idirs}) +updImportDirs f pk@(Package {import_dirs = idirs}) hunk ./src/System/Plugins/PackageAPI.hs 77 -updLibraryDirs f pk@(Package {library_dirs = ldirs}) +updLibraryDirs f pk@(Package {library_dirs = ldirs}) } Context: [Cabal >= 1.2.3 Don Stewart **20071220022555] [TAG plugins 1.1 Don Stewart **20071216071026] Patch bundle hash: 53eceb5ae4bf510dddf9573adc1db28f35669774