Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 15:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Renamed JNA jars and Bluecove patch, added patches for JNA and Silvertunnel.

Browse Source
This commit is contained in:
akwizgran
2013-01-04 01:36:50 +00:00
parent 41a3f8e6cc
commit 8f15c44520
8 changed files with 358 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
bluecove-2.1.1-SNAPSHOT.patch Normal file
View File

@@ -0,0 +1,63 @@
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove/pom.xml bluecove-2.1.1-SNAPSHOT-briar/bluecove/pom.xml
--- bluecove-2.1.1-SNAPSHOT/bluecove/pom.xml 2013-01-04 00:43:17.961294408 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove/pom.xml 2013-01-03 23:17:37.549293571 +0000
@@ -126,8 +126,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.3</source>
- <target>1.1</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
@@ -355,7 +355,7 @@
<configuration>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.4</targetJdk>
+ <targetJdk>1.5</targetJdk>
</configuration>
</plugin>
<plugin>
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm bluecove-2.1.1-SNAPSHOT-briar/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm
--- bluecove-2.1.1-SNAPSHOT/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm 2013-01-04 00:43:17.549293781 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove/src/main/c/intelbth/OSXStackRFCOMMServer.mm 2013-01-03 23:19:02.269295705 +0000
@@ -280,6 +280,10 @@
ndebug(("fail to get IOBluetoothRFCOMMChannel"));
return;
}
+ if(![rfcommChannel isIncoming]) {
+ ndebug(("ignoring outgoing connection"));
+ return;
+ }
if (comm->authenticate) {
IOBluetoothDevice* device = [rfcommChannel getDevice];
if (device == NULL) {
diff -Bbur bluecove-2.1.1-SNAPSHOT/bluecove-gpl/pom.xml bluecove-2.1.1-SNAPSHOT-briar/bluecove-gpl/pom.xml
--- bluecove-2.1.1-SNAPSHOT/bluecove-gpl/pom.xml 2013-01-04 00:43:14.509294005 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/bluecove-gpl/pom.xml 2013-01-03 23:17:52.181293751 +0000
@@ -81,8 +81,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.3</source>
- <target>1.1</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
diff -Bbur bluecove-2.1.1-SNAPSHOT/pom.xml bluecove-2.1.1-SNAPSHOT-briar/pom.xml
--- bluecove-2.1.1-SNAPSHOT/pom.xml 2013-01-04 00:43:19.721293788 +0000
+++ bluecove-2.1.1-SNAPSHOT-briar/pom.xml 2013-01-03 23:17:18.713293930 +0000
@@ -436,7 +436,7 @@
<configuration>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.4</targetJdk>
+ <targetJdk>1.5</targetJdk>
</configuration>
</plugin>
<plugin>