Author: tille Date: 2014-08-15 07:32:15 +0000 (Fri, 15 Aug 2014) New Revision: 17735
Added: trunk/packages/ffindex/trunk/debian/patches/clang.patch Modified: trunk/packages/ffindex/trunk/debian/changelog trunk/packages/ffindex/trunk/debian/patches/series Log: Build with clang Modified: trunk/packages/ffindex/trunk/debian/changelog =================================================================== --- trunk/packages/ffindex/trunk/debian/changelog 2014-08-15 06:51:12 UTC (rev 17734) +++ trunk/packages/ffindex/trunk/debian/changelog 2014-08-15 07:32:15 UTC (rev 17735) @@ -1,3 +1,10 @@ +ffindex (0.9.9.3-2) UNRELEASED; urgency=medium + + * Build with clang (thanks for the patch to Alexander <[email protected]>) + Closes: #758149 + + -- Andreas Tille <[email protected]> Fri, 15 Aug 2014 09:25:28 +0200 + ffindex (0.9.9.3-1) unstable; urgency=low * New upstream release. Added: trunk/packages/ffindex/trunk/debian/patches/clang.patch =================================================================== --- trunk/packages/ffindex/trunk/debian/patches/clang.patch (rev 0) +++ trunk/packages/ffindex/trunk/debian/patches/clang.patch 2014-08-15 07:32:15 UTC (rev 17735) @@ -0,0 +1,43 @@ +Description: Enable building with clang +Author: Alexander <[email protected]> +Last-Update: Thu, 14 Aug 2014 23:42:00 +0400 + + +--- ffindex-0.9.9.3.orig/src/ffindex.c ++++ ffindex-0.9.9.3/src/ffindex.c +@@ -510,11 +510,10 @@ ffindex_index_t* ffindex_index_as_tree(f + return index; + } + ++static FILE* index_file_action = NULL; ++static int ret_action = EXIT_SUCCESS; + +-int ffindex_tree_write(ffindex_index_t* index, FILE* index_file) +-{ +- int ret = EXIT_SUCCESS; +- void action(const void *node, const VISIT which, const int depth) ++static void action(const void *node, const VISIT which, const int depth) + { + ffindex_entry_t *entry; + switch (which) +@@ -526,13 +525,17 @@ int ffindex_tree_write(ffindex_index_t* + case postorder: + case leaf: + entry = *(ffindex_entry_t **) node; +- if(fprintf(index_file, "%s\t%zd\t%zd\n", entry->name, entry->offset, entry->length) < 0) +- ret = EXIT_FAILURE; ++ if(fprintf(index_file_action, "%s\t%zd\t%zd\n", entry->name, entry->offset, entry->length) < 0) ++ ret_action = EXIT_FAILURE; + break; + } + } ++ ++int ffindex_tree_write(ffindex_index_t* index, FILE* index_file) ++{ ++ index_file_action = index_file; + twalk(index->tree_root, action); +- return ret; ++ return ret_action; + } + + /* vim: ts=2 sw=2 et Modified: trunk/packages/ffindex/trunk/debian/patches/series =================================================================== --- trunk/packages/ffindex/trunk/debian/patches/series 2014-08-15 06:51:12 UTC (rev 17734) +++ trunk/packages/ffindex/trunk/debian/patches/series 2014-08-15 07:32:15 UTC (rev 17735) @@ -1,2 +1,3 @@ Makefile basename +clang.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
