Merge branch 'master' of ssh://git-annex.branchable.com

5 files changed, 99 insertions, 0 deletions

diff --git a/doc/bugs/Add_custom-setup_stanza_to_.cabal_file.mdwn b/doc/bugs/Add_custom-setup_stanza_to_.cabal_file.mdwn
new file mode 100644
index 000000000..51d4f189d
--- /dev/null
+++ b/doc/bugs/Add_custom-setup_stanza_to_.cabal_file.mdwn
@@ -0,0 +1,46 @@
+### Please describe the problem.
+
+git-annex uses a custom setup script but does not have a custom-setup stanza. This causes
+git-annex to be unbuildable with `cabal new-build` and I'm told it's also unbuildable with
+the old `cabal build` under certain circumstances.
+
+### What steps will reproduce the problem?
+
+Try building git-annex with `cabal new-build`.
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex-6.20171214 on Debian GNU/Linux 9.
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+$ cabal new-build --constraint="any.git-annex -testsuite" 
+Resolving dependencies...
+In order, the following will be built (use -v for more details):
+ - git-annex-6.20171214 (exe:git-annex) -testsuite -dbus -concurrentoutput (requires build)
+ - dummypkg-0 (lib) (first run)
+Configuring git-annex-6.20171214 (all, legacy fallback)...
+cabal: Failed to build git-annex-6.20171214 (which is required by dummypkg-0).
+The failure occurred during the configure step. The exception was:
+dieVerbatim: user error (cabal: '/usr/bin/ghc' exited with an error:
+
+/home/matthew/dummypkg/dist-newstyle/tmp/src-3285/git-annex-6.20171214/Utility/FileSize.hs:10:1:
+error:
+Failed to load interface for ‘System.PosixCompat.Files’
+It is a member of the hidden package ‘unix-compat-0.5.0.1’.
+Perhaps you need to add ‘unix-compat’ to the build-depends in your .cabal
+file.
+Use -v to see a list of the files searched for.
+)
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+Yeah, it's amazing! I've been using the version from the Debian repos and then
+wanted to try building the new version for youtube-dl support.
diff --git a/doc/bugs/Add_custom-setup_stanza_to_.cabal_file/comment_1_88d5109a342e6a06d2f9f400cf850e3d._comment b/doc/bugs/Add_custom-setup_stanza_to_.cabal_file/comment_1_88d5109a342e6a06d2f9f400cf850e3d._comment
new file mode 100644
index 000000000..ccad24c3d
--- /dev/null
+++ b/doc/bugs/Add_custom-setup_stanza_to_.cabal_file/comment_1_88d5109a342e6a06d2f9f400cf850e3d._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="mbekkema97@66b135681014f005a3a14c4011d148fcb6655f81"
+ nickname="mbekkema97"
+ avatar="http://cdn.libravatar.org/avatar/a5037b8a5914bd9f803af7b7e881d632"
+ subject="I just found out you're already aware of this"
+ date="2017-12-15T07:16:13Z"
+ content="""
+https://github.com/haskell/cabal/issues/4852
+"""]]
diff --git a/doc/bugs/__39__web__39___remote_does_not_work_on_Android.mdwn b/doc/bugs/__39__web__39___remote_does_not_work_on_Android.mdwn
new file mode 100644
index 000000000..9665894eb
--- /dev/null
+++ b/doc/bugs/__39__web__39___remote_does_not_work_on_Android.mdwn
@@ -0,0 +1,22 @@
+### Please describe the problem.
+On Android, any attempt by git-annex to use the 'web' special remote won't work, instead wget will complain about the user-agent parameter. This is very annoying when I have web URLs registered for numerous files. 
+
+### What steps will reproduce the problem?
+Try to grab a file via git-annex that has an attached web URL on Android. 
+
+### What version of git-annex are you using? On what operating system?
+Latest version of git-annex app on an Android 5 tablet.
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+
diff --git a/doc/bugs/android__58___cannot_link_executable/comment_5_6c94c327f6dc1c039f9bc5cfaea455ee._comment b/doc/bugs/android__58___cannot_link_executable/comment_5_6c94c327f6dc1c039f9bc5cfaea455ee._comment
new file mode 100644
index 000000000..f39e4edb3
--- /dev/null
+++ b/doc/bugs/android__58___cannot_link_executable/comment_5_6c94c327f6dc1c039f9bc5cfaea455ee._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://christian.amsuess.com/chrysn"
+ avatar="http://christian.amsuess.com/avatar/c6c0d57d63ac88f3541522c4b21198c3c7169a665a2f2d733b4f78670322ffdc"
+ subject="Issue also affects LineageOS"
+ date="2017-12-17T12:04:52Z"
+ content="""
+I've installed LineageOS (Android 7.1.2 Nightly) on aforementioned SM-T813.
+
+The issue affects that setup as well, both in the \"current\" and the \"autobuild\" version for Android 5.0.
+
+Full message:
+
+    Falling back to hardcoded app location; cannot find expected files in /data/app/ga.androidterm-1/lib
+    git annex webapp
+    gts210vewifi:/sdcard/git-annex.home $ git annex webapp
+    CANNOT LINK EXECUTABLE \"git-annex\": /data/app/ga.androidterm-1/lib/arm/lib.git-annex.so: has text relocations
+    error: git-annex died of signal 6
+    134|gts210vewifi:/sdcard/git-annex.home $
+"""]]
diff --git a/doc/forum/compiling_on_MacOS.mdwn b/doc/forum/compiling_on_MacOS.mdwn
new file mode 100644
index 000000000..c6732e364
--- /dev/null
+++ b/doc/forum/compiling_on_MacOS.mdwn
@@ -0,0 +1,3 @@
+When compiling on MacOS using Stack, I get errors related to the iconv library:
+https://travis-ci.org/conda-forge/staged-recipes/builds/315444536?utm_source=github_status&utm_medium=notification
+Any suggestions on how to fix this?