diff options
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 4 | ||||
| -rw-r--r-- | Utility/WebApp.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/links_in_firefox_do_not_always_work.mdwn | 6 | ||||
| -rw-r--r-- | doc/install/Windows.mdwn | 10 | ||||
| -rw-r--r-- | doc/todo/windows_support.mdwn | 9 |
6 files changed, 22 insertions, 10 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 6a56eadbb..d9afb9adf 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -50,9 +50,13 @@ import Data.Time.Clock checkCanWatch :: Annex () checkCanWatch | canWatch = do +#ifndef mingw32_HOST_OS liftIO Lsof.setup unlessM (liftIO (inPath "lsof") <||> Annex.getState Annex.force) needLsof +#else + noop +#endif | otherwise = error "watch mode is not available on this system" needLsof :: Annex () diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs index 225021b2e..f92c21e4e 100644 --- a/Utility/WebApp.hs +++ b/Utility/WebApp.hs @@ -39,7 +39,6 @@ import Control.Concurrent #ifdef __ANDROID__ import Data.Endian #endif -import Network.Socket (withSocketsDo) localhost :: HostName localhost = "localhost" diff --git a/debian/changelog b/debian/changelog index 862fa4e7b..a51f2b664 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ git-annex (5.20131131) UNRELEASED; urgency=low * import: better handling of overwriting an existing file/directory/broken link when importing * Windows: assistant and webapp work! (very experimental) + * Fix bad behavior in Firefox, which was caused by an earlier fix to + bad behavior in Chromium. -- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400 diff --git a/doc/bugs/links_in_firefox_do_not_always_work.mdwn b/doc/bugs/links_in_firefox_do_not_always_work.mdwn index dec8d7ec7..d0b735083 100644 --- a/doc/bugs/links_in_firefox_do_not_always_work.mdwn +++ b/doc/bugs/links_in_firefox_do_not_always_work.mdwn @@ -18,3 +18,9 @@ Ubuntu 13.04, firefox 25.0.1 --Walter + +> [[fixed|done]]; increased number of longpolling failures allowed before +> it enters the chromium back button bugfix workaround to 12. +> Should be more than enough for 3 or 4 long polling elements on a page. +> (Considered only running the chromium bugfix on chromium, but I don't +> want to get into browser detection hacks.) --[[Joey]] diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn index 07a77d382..3a8c4e72a 100644 --- a/doc/install/Windows.mdwn +++ b/doc/install/Windows.mdwn @@ -24,11 +24,15 @@ A daily build is also available, thanks to Yury V. Zaytsev and ## building it yourself To build git-annex from source on Windows, you need to install -the Haskell Platform, Mingw, and Cygwin. Use Cygwin to install -gcc, rsync, git, wget, ssh, and gnupg. To build the git-annex installer, -you also need to install the NulSoft installer system. +the Haskell Platform, Mingw, and Cygwin. Use Cygwin to install: +gcc rsync git wget ssh gnupg + +Once the prerequisites are installed, run: cabal update git clone git://git-annex.branchable.com/ gitannex cd gitannex build + +(To build the git-annex installer, you also need to install the NulSoft +installer system.) diff --git a/doc/todo/windows_support.mdwn b/doc/todo/windows_support.mdwn index 6a4d63a42..3b538e14c 100644 --- a/doc/todo/windows_support.mdwn +++ b/doc/todo/windows_support.mdwn @@ -5,7 +5,7 @@ now! --[[Joey]] * Does not work with Cygwin's build of git (that git does not consistently support use of DOS style paths, which git-annex uses on Windows). - Must use the upstream build of git for Windows. + Must use Msysgit. * rsync special remotes are known buggy. * Bad file locking, it's probably not safe to run more than one git-annex process at the same time on Windows. @@ -18,8 +18,5 @@ now! --[[Joey]] repo creation, autostart, restarting, etc, as --force is not propigated.) * `git annex assistant` has not been tested, is probably quite incomplete. Is known to not download any files. (transferrer doesn't built yet) -* webapp: Odd problem when using Firefox: Some links don't seem to load. - Clicking on such a link repeatedly will eventually load the right page. - Network console shows web browser is requesting page "/" - despite a link to another page being clicked on. Workaround: Use Chrome - instead; no such problem there. +* No XMPP support (needs a lot of C libraries which are available in + cygwin, but pkg-config does not list them once installed). |