From 34f375526f44ff255d45bbabcd1425b3d5d0bb4a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Nov 2016 14:26:20 -0400 Subject: 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. --- ...ls_0.1.4-0001-statically-link-with-gnutls.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch (limited to 'standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch') 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 -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 - -- cgit v1.2.3