| 1 |
flameeyes 11/10/31 12:51:22 |
| 2 |
|
| 3 |
Added: libxmlpatch-0.3.3-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump, with a totally new Gentoo patch to fix a bunch of issues (need to send that upstream). Also fix HOMEPAGE on old version. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libxmlpatch-0.3.3-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
Index: libxmlpatch-0.3.3/tests/check_diff.c |
| 18 |
=================================================================== |
| 19 |
--- libxmlpatch-0.3.3.orig/tests/check_diff.c |
| 20 |
+++ libxmlpatch-0.3.3/tests/check_diff.c |
| 21 |
@@ -259,7 +259,13 @@ static struct { |
| 22 |
static void |
| 23 |
add_test (TCase *tc, int i) |
| 24 |
{ |
| 25 |
- _tcase_add_test (tc, arr_tests[i].fn, arr_tests[i].name, 0, 0, 1); |
| 26 |
+ _tcase_add_test (tc, arr_tests[i].fn, arr_tests[i].name, |
| 27 |
+#if CHECK_MAJOR_VERSION > 0 || \ |
| 28 |
+ (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION > 9) || \ |
| 29 |
+ (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION >= 8) |
| 30 |
+ 0, |
| 31 |
+#endif |
| 32 |
+ 0, 0, 1); |
| 33 |
} |
| 34 |
|
| 35 |
static void |
| 36 |
Index: libxmlpatch-0.3.3/configure.in |
| 37 |
=================================================================== |
| 38 |
--- libxmlpatch-0.3.3.orig/configure.in |
| 39 |
+++ libxmlpatch-0.3.3/configure.in |
| 40 |
@@ -74,7 +74,13 @@ fi |
| 41 |
|
| 42 |
PKG_CHECK_MODULES(DEPS_XML, libxml-2.0) |
| 43 |
PKG_CHECK_MODULES(DEPS_GLIB, glib-2.0) |
| 44 |
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) |
| 45 |
+ |
| 46 |
+AC_ARG_WITH([check], |
| 47 |
+ AS_HELP_STRING([--without-check], [Do not build tests based on check package @<:@default=auto@:>@])) |
| 48 |
+AS_IF([test "x$with_check" != "xno"], [ |
| 49 |
+PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], , [with_check=no]) |
| 50 |
+]) |
| 51 |
+AM_CONDITIONAL([TESTS], [test "x$with_check" != "xno"]) |
| 52 |
|
| 53 |
AC_SUBST(DEPS_XML_CFLAGS) |
| 54 |
AC_SUBST(DEPS_XML_LIBS) |
| 55 |
Index: libxmlpatch-0.3.3/tests/Makefile.am |
| 56 |
=================================================================== |
| 57 |
--- libxmlpatch-0.3.3.orig/tests/Makefile.am |
| 58 |
+++ libxmlpatch-0.3.3/tests/Makefile.am |
| 59 |
@@ -1,10 +1,11 @@ |
| 60 |
+if TESTS |
| 61 |
TESTS = test-diff |
| 62 |
+check_PROGRAMS = test-diff |
| 63 |
+endif |
| 64 |
|
| 65 |
-test_PROGRAMS = test-diff |
| 66 |
test_diff_SOURCES = check_diff.c |
| 67 |
test_diff_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/diff @CHECK_CFLAGS@ $(DEPS_XML_CFLAGS) $(DEPS_GLIB_CFLAGS) |
| 68 |
test_diff_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS) |
| 69 |
-testdir = $(libdir)/tests/xml_diff |
| 70 |
|
| 71 |
bin_PROGRAMS = xml_patch xml_diff |
Archives