aboutsummaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-11-14 14:26:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-11-14 14:53:08 -0400
commit34f375526f44ff255d45bbabcd1425b3d5d0bb4a (patch)
treea78e27f5e125587828f30af3abef691b33baae88 /standalone
parente7088c519678f63f460646cc19c3e25423da4f00 (diff)
remove xmpp support
I've long considered the XMPP support in git-annex a wart. It's nice to remove it. (This also removes the NetMessager, which was only used for XMPP, and the daemonstatus's desynced list (likewise).) Existing XMPP remotes should be ignored by git-annex. This commit was sponsored by Brock Spratlen on Patreon.
Diffstat (limited to 'standalone')
-rw-r--r--standalone/android/cabal.config1
-rw-r--r--standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch50
-rw-r--r--standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch43
-rwxr-xr-xstandalone/android/install-haskell-packages3
4 files changed, 0 insertions, 97 deletions
diff --git a/standalone/android/cabal.config b/standalone/android/cabal.config
index dd57db47e..f61fe9a0b 100644
--- a/standalone/android/cabal.config
+++ b/standalone/android/cabal.config
@@ -111,7 +111,6 @@ constraints: unix installed,
network-conduit ==1.1.0,
network-info ==0.2.0.5,
network-multicast ==0.0.10,
- network-protocol-xmpp ==0.4.6,
network-uri ==2.6.0.1,
optparse-applicative ==0.11.0.2,
parallel ==3.2.0.4,
diff --git a/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch b/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
deleted file mode 100644
index ff9d8f245..000000000
--- a/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From afdec6c9e66211a0ac8419fffe191b059d1fd00c Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 17:24:33 +0000
-Subject: [PATCH] fix build with new base
-
----
- Data/Text/IDN/IDNA.chs | 1 +
- Data/Text/IDN/Punycode.chs | 1 +
- Data/Text/IDN/StringPrep.chs | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/Data/Text/IDN/IDNA.chs b/Data/Text/IDN/IDNA.chs
-index ed29ee4..dbb4ba5 100644
---- a/Data/Text/IDN/IDNA.chs
-+++ b/Data/Text/IDN/IDNA.chs
-@@ -31,6 +31,7 @@ import Foreign
- import Foreign.C
-
- import Data.Text.IDN.Internal
-+import System.IO.Unsafe
-
- #include <idna.h>
- #include <idn-free.h>
-diff --git a/Data/Text/IDN/Punycode.chs b/Data/Text/IDN/Punycode.chs
-index 24b5fa6..4e62555 100644
---- a/Data/Text/IDN/Punycode.chs
-+++ b/Data/Text/IDN/Punycode.chs
-@@ -32,6 +32,7 @@ import Data.List (unfoldr)
- import qualified Data.ByteString as B
- import qualified Data.Text as T
-
-+import System.IO.Unsafe
- import Foreign
- import Foreign.C
-
-diff --git a/Data/Text/IDN/StringPrep.chs b/Data/Text/IDN/StringPrep.chs
-index 752dc9e..5e9fd84 100644
---- a/Data/Text/IDN/StringPrep.chs
-+++ b/Data/Text/IDN/StringPrep.chs
-@@ -39,6 +39,7 @@ import qualified Data.ByteString as B
- import qualified Data.Text as T
- import qualified Data.Text.Encoding as TE
-
-+import System.IO.Unsafe
- import Foreign
- import Foreign.C
-
---
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch b/standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch
deleted file mode 100644
index 6f75da240..000000000
--- a/standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 311aab1ae9d7a653edfbec1351f548b98de85c4b Mon Sep 17 00:00:00 2001
-From: androidbuilder <androidbuilder@example.com>
-Date: Mon, 26 May 2014 21:54:18 +0000
-Subject: [PATCH] hack gnutls to link on android
-
-This uses a hardcoded path to the library, which includes the
-arm-linux-androideabi-4.8 part. Will need to be changed when that changes..
-
-Have to list all the libraries that gnutls depends on, pkgconfig depends
-seems not to be working.
----
- gnutls.cabal | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/gnutls.cabal b/gnutls.cabal
-index 5bfe687..61db23f 100644
---- a/gnutls.cabal
-+++ b/gnutls.cabal
-@@ -31,16 +31,17 @@ source-repository this
- library
- hs-source-dirs: lib
- ghc-options: -Wall -O2
-+ LD-Options: -L /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/sysroot/usr/lib/
-+
-+ extra-libraries: gnutls nettle hogweed gmp z
-+ pkgconfig-depends: gnutls
-
- build-depends:
- base >= 4.0 && < 5.0
-- , bytestring >= 0.9
-+ , bytestring >= 0.10.3.0
- , transformers >= 0.2
- , monads-tf >= 0.1 && < 0.2
-
-- extra-libraries: gnutls
-- pkgconfig-depends: gnutls
--
- exposed-modules:
- Network.Protocol.TLS.GNU
-
---
-1.7.10.4
-
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index 0e6b8cba4..7d79d0b80 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -111,10 +111,7 @@ EOF
patched DAV
patched yesod-static
patched dns
- patched gnutls
patched unbounded-delays
- patched gnuidn
- patched network-protocol-xmpp
patched uuid
cd ..