monotone 0.21 and associated patches

diff --git a/packages/monotone/files/configure.ac.patch b/packages/monotone/files/configure.ac.patch
new file mode 100644 (file)
index 0000000..2d3e755
--- /dev/null
+++ b/packages/monotone/files/configure.ac.patch
@@ -0,0 +1,36 @@
+--- monotone-0.21/configure.ac.orig    2005-07-17 19:23:29.580829434 -0700
++++ monotone-0.21/configure.ac 2005-07-17 19:28:50.237223287 -0700
+@@ -82,9 +82,14 @@
+ AC_DEFUN([BOOST_VERSION_CHECK],
+ [AC_CACHE_CHECK([boost version 1.32 or newer], ac_cv_version_boost,
+ [
+-  AC_TRY_RUN(
++  AC_TRY_COMPILE(
+   [#include <boost/version.hpp>
+-  int main() { return (BOOST_VERSION < 103200); }],
++  #if BOOST_VERSION < 103200
++  int main() { return (BOOST_VERSION < 103200); }
++  #else
++  #error boost version is ok
++  #endif
++  ],
+   ac_cv_version_boost=yes,
+   ac_cv_version_boost=no)
+ ])
+@@ -101,9 +106,14 @@
+ AC_DEFUN([BOOST_FIX_VERSION],
+ [AC_CACHE_CHECK([if boost requires extra flags to compile], ac_fix_boost,
+ [
+-  AC_TRY_RUN(
++  AC_TRY_COMPILE(
+   [#include <boost/version.hpp>
+-  int main() { return (BOOST_VERSION != 103200); }],
++  #if BOOST_VERSION != 103200
++  int main() { return (BOOST_VERSION != 103200); }
++  #else
++  #error boost version is not 1.32.0
++  #endif
++  ],
+   ac_fix_boost=yes,
+   ac_fix_boost=no)
+ ])

diff --git a/packages/monotone/files/uclibc.database.hh.stdarg.patch b/packages/monotone/files/uclibc.database.hh.stdarg.patch
new file mode 100644 (file)
index 0000000..1590b7d
--- /dev/null
+++ b/packages/monotone/files/uclibc.database.hh.stdarg.patch
@@ -0,0 +1,10 @@
+--- monotone-0.21/database.hh.orig     2005-07-17 19:59:00.312846093 -0700
++++ monotone-0.21/database.hh  2005-07-17 19:59:56.259365537 -0700
+@@ -14,6 +14,7 @@
+ #include <set>
+ #include <map>
+ #include <string>
++#include <stdarg.h>
+ 
+ #include <boost/filesystem/path.hpp>
+ 

diff --git a/packages/monotone/monotone-5_0.21.bb b/packages/monotone/monotone-5_0.21.bb
new file mode 100644 (file)
index 0000000..ec31e22
--- /dev/null
+++ b/packages/monotone/monotone-5_0.21.bb
@@ -0,0 +1,12 @@
+include monotone.inc
+
+PR = "r0"
+
+SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \
+           file://txt2c-cross.patch;patch=1 \
+           file://cryptopp-endianness.patch;patch=1 \
+          file://configure.ac.patch;patch=1 \
+          file://uclibc.database.hh.stdarg.patch;patch=1 \
+          "
+
+ALTERNATIVE_PRIORITY = "50"

diff --git a/packages/monotone/monotone.inc b/packages/monotone/monotone.inc
index a0b9463..7248a98 100644 (file)
--- a/packages/monotone/monotone.inc
+++ b/packages/monotone/monotone.inc
@@ -40,6 +40,6 @@ do_install_append() {
 PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
 tsd = "/home/monotone/${PN}"
 FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests"
-RDEPENDS_${PN}-testsuite += "bash sed grep cvs"
+RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch"
 # The testsuite also requires the following - not yet available...
-#RDEPENDS_${PN}-testsuite += "patch perl"
+#RDEPENDS_${PN}-testsuite += "perl"