From 94b8905e3fbe6bc9d55bc33341e087f989056b4e Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Sat, 19 Apr 2014 18:18:49 +0200
Subject: [PATCH] Conversations: Build otr4j from source

---
 metadata/eu.siacs.conversations.txt | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/metadata/eu.siacs.conversations.txt b/metadata/eu.siacs.conversations.txt
index 6a9bffccbc..e83e8f85fa 100644
--- a/metadata/eu.siacs.conversations.txt
+++ b/metadata/eu.siacs.conversations.txt
@@ -21,39 +21,23 @@ Noteable XEPs:
 * XEP-0198: Stream Management
 * XEP-0280: Message Carbons
 * XEP-0237: Roster Versioning
-
-This app uses precompiled binary libraries verified to match their
-upstream hashes.
 .
 
 Repo Type:git
 Repo:https://github.com/siacs/Conversations.git
 
 Build:0.1.3,9
-    srclibs=Otr4j-jitsi@33d95bb3710986d048fb4cbe42dc991f9ddd9de2,BouncyCastle@r1rv50
+    srclibs=Otr4j-jitsi@30fbaea9388616b268de82be0267acf2441b218b,BouncyCastle@r1rv50
     commit=0.1.3
     submodules=yes
-    rm=libs/bcprov-jdk15on-150.jar
+    rm=libs/bcprov-jdk15on-150.jar,libs/otr4j-0.10.jar
     scanignore=libs/otr4j-0.10.jar,libs/bcprov-jdk15on-150.jar
     prebuild=pushd $$BouncyCastle$$ && \
         ant -f ant/jdk15+.xml build-provider && \
-        popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/
-
-Maintainer Notes:
-
-This app uses precompiled open-source jars that have been verified to
-match hashes from upstream. 
-
-HASHES MUST BE RE-CHECKED ON CHANGE!
-
-== OTR4J ==
-cp -r $$Otr4j-jitsi$$/src/main src/
-
-Commits for otr4j:
-otr4j-0.10 33d95bb3710986d048fb4cbe42dc991f9ddd9de2
-otr4j-HEAD 6d879761605dba48c80c0d3f44a6555b522d0c2e
-
-.
+        popd && cp $$BouncyCastle$$/build/artifacts/jdk1.5/jars/bcprov-jdk15on-150.jar libs/ && \
+        pushd $$Otr4j-jitsi$$ && \
+        mvn clean && mvn package && popd && \
+        cp $$Otr4j-jitsi$$/target/otr4j-0.10.jar libs/
 
 Auto Update Mode:None
 Update Check Mode:Tags