Remove old recipe, and create patch for Fossil 1.36

* Remove fossil-1.35 recipe * Create patches directory and add patch for Fossil 1.36 * Patch is only temporary, as Fossil 1.37 will have the necessary fix
haikuports · Nov 6, 2016 · 2a7642c · 2a7642c
1 parent 3b4eecf
commit 2a7642c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 53 deletions.
diff --git a/dev-vcs/fossil/fossil-1.35.recipe b/dev-vcs/fossil/fossil-1.35.recipe
diff --git a/dev-vcs/fossil/fossil-1.36.recipe b/dev-vcs/fossil/fossil-1.36.recipe
@@ -13,6 +13,8 @@ REVISION="2"
 SOURCE_URI="https://www.fossil-scm.org/index.html/uv/download/fossil-src-$portVersion.tar.gz"
 CHECKSUM_SHA256="2676c35ec5e44099a3522e7e9f1d1f84a9338db4457618d5338cb6826d0dfd12"
 
+PATCHES="fossil-$portVersion.patch"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="

diff --git a/dev-vcs/fossil/patches/fossil-1.36.patch b/dev-vcs/fossil/patches/fossil-1.36.patch
@@ -0,0 +1,15 @@
+diff --git a/src/tkt.c b/src/tkt.c
+index 100e8f1..09aa68a 100644
+--- a/src/tkt.c
++++ b/src/tkt.c
+@@ -548,8 +548,9 @@ static int ticket_put(
+   int needMod              /* True if moderation is needed */
+ ){
+   int result;
++  int rid;
+   manifest_crosslink_begin();
+-  int rid = content_put_ex(pTicket, 0, 0, 0, needMod);
++  rid = content_put_ex(pTicket, 0, 0, 0, needMod);
+   if( rid==0 ){
+     fossil_fatal("trouble committing ticket: %s", g.zErrMsg);
+   }