--- a/components/re2c/Makefile Fri Mar 11 05:37:50 2016 -0800
+++ b/components/re2c/Makefile Fri Mar 11 05:40:58 2016 -0800
@@ -25,16 +25,16 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= re2c
-COMPONENT_VERSION= 0.14.2
-COMPONENT_PROJECT_URL= http://sf.net/projects/re2c/
+COMPONENT_VERSION= 0.16
+COMPONENT_PROJECT_URL= http://re2c.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:a702eb63977af4715555edb41eba3b47bbfdcdb44b566d146869a7db022f1c30
-COMPONENT_ARCHIVE_URL= http://downloads.sourceforge.net/project/$(COMPONENT_NAME)/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+ sha256:48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84
+COMPONENT_ARCHIVE_URL= https://github.com/skvadrik/$(COMPONENT_NAME)/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/re2c
-TPNO = 22638
+TPNO = 27272
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
--- a/components/re2c/patches/fix-tests.patch Fri Mar 11 05:37:50 2016 -0800
+++ b/components/re2c/patches/fix-tests.patch Fri Mar 11 05:40:58 2016 -0800
@@ -4,23 +4,23 @@
This patch should be sent upstream.
---- re2c-0.14.2/run_tests.sh.in.orig 2015-10-13 06:22:20.787156312 -0700
-+++ re2c-0.14.2/run_tests.sh.in 2015-10-13 06:33:42.229167381 -0700
-@@ -14,7 +14,7 @@
- if uname|grep -q -i 'CYGWIN' && test -x "@WINBUILDDIR@/re2c.exe"; then
- re2c='@WINBUILDDIR@/re2c.exe'
- else
--re2c='@builddir@/re2c'
+--- re2c-0.16/run_tests.sh.in.orig 2016-03-08 06:11:49.073497153 -0800
++++ re2c-0.16/run_tests.sh.in 2016-03-08 13:59:57.512468231 -0800
+@@ -28,7 +28,7 @@
+ skeleton=0
+ keep_tmp_files=0
+ wine=""
+-re2c="./re2c"
+re2c="${RE2C_BIN:-@builddir@/re2c}"
+ threads=`detect_cpu_count; echo $CPUS`
+ tests=()
+ for arg in $*
+@@ -57,7 +57,7 @@
+ test_srcdir=""
+ if [ ${#tests[@]} -eq 0 ]
+ then
+- test_srcdir="@top_srcdir@/test"
++ test_srcdir="./test"
+ tests=(`find $test_srcdir -name '*.re' | sort`)
fi
- if test ! -x "${re2c}"; then
- echo "Cannot find re2c executable (${re2c})."
-@@ -33,7 +33,7 @@
- fi
- echo "Diffing: ${diff}"
- if test $# = 0; then
--tests=`for i in test lessons; do find @top_srcdir@/$i -name '*.re'; done|sort`
-+tests=`for i in test lessons; do find ./$i -name '*.re'; done|sort`
- else
- tests="$@"
- fi;
+ test_blddir="test_"`date +%y%m%d%H%M%S`
--- a/components/re2c/test/results-64.master Fri Mar 11 05:37:50 2016 -0800
+++ b/components/re2c/test/results-64.master Fri Mar 11 05:40:58 2016 -0800
@@ -1,27 +1,37 @@
-make[1]: Entering directory `$(@D)'
-/usr/gnu/bin/make check-am
-make[2]: Entering directory `$(@D)'
+make[1]: Entering directory '$(@D)'
+Reconfigure to rebuild docs: ./configure --enable-docs
+/usr/gnu/bin/make testrange testston32unsafe
+make[2]: Entering directory '$(@D)'
+ CXX src/test/range/test.o
+In file included from ./src/util/range.h:10:0,
+ from ./src/test/range/test-impl.h:5,
+ from src/test/range/test.cc:4:
+./src/util/free_list.h: In instantiation of 'class re2c::free_list<re2c::Range*>':
+./src/util/range.h:37:12: required from here
+./src/util/free_list.h:10:7: warning: base class 'class std::set<re2c::Range*, std::less<re2c::Range*>, std::allocator<re2c::Range*> >' has a non-virtual destructor [-Weffc++]
+ class free_list: protected std::set<_Ty>
+ ^
+ CXXLD testrange
+ CXX src/test/s_to_n32_unsafe/test.o
+ CXXLD testston32unsafe
+make[2]: Leaving directory '$(@D)'
/usr/gnu/bin/make check-TESTS
-make[3]: Entering directory `$(@D)'
-make[4]: Entering directory `$(@D)'
+make[2]: Entering directory '$(@D)'
+make[3]: Entering directory '$(@D)'
PASS: run_tests.sh
-make[5]: Entering directory `$(@D)'
-/usr/gnu/bin/make all-am
-make[6]: Entering directory `$(@D)'
-make[6]: Leaving directory `$(@D)'
-make[5]: Leaving directory `$(@D)'
+PASS: testrange
+PASS: testston32unsafe
============================================================================
-Testsuite summary for re2c 0.14.2
+Testsuite summary for re2c 0.16
============================================================================
-# TOTAL: 1
-# PASS: 1
+# TOTAL: 3
+# PASS: 3
# SKIP: 0
# XFAIL: 0
# FAIL: 0
# XPASS: 0
# ERROR: 0
============================================================================
-make[4]: Leaving directory `$(@D)'
-make[3]: Leaving directory `$(@D)'
-make[2]: Leaving directory `$(@D)'
-make[1]: Leaving directory `$(@D)'
+make[3]: Leaving directory '$(@D)'
+make[2]: Leaving directory '$(@D)'
+make[1]: Leaving directory '$(@D)'