This is an automated email from the git hooks/post-receive script. ghisvail-guest pushed a commit to branch master in repository ismrmrd.
commit 5763085d1b7e954817125e8a22e6d353574a9146 Author: Ghislain Antony Vaillant <[email protected]> Date: Mon Oct 26 10:33:49 2015 +0000 Refresh patch queue. --- debian/patches/Disable-HTML-timestamps.patch | 22 ++++++ .../patches/Explicit-64-bit-shifts-for-flags.patch | 89 ++++++++++++++++++++++ debian/patches/cmake-install-docs.patch | 21 ----- .../fixing-check-after-free-in-unit-tests.patch | 39 ---------- debian/patches/make-build-reproducible.patch | 17 ----- debian/patches/series | 5 +- 6 files changed, 113 insertions(+), 80 deletions(-) diff --git a/debian/patches/Disable-HTML-timestamps.patch b/debian/patches/Disable-HTML-timestamps.patch new file mode 100644 index 0000000..63190a9 --- /dev/null +++ b/debian/patches/Disable-HTML-timestamps.patch @@ -0,0 +1,22 @@ +From: Ghislain Antony Vaillant <[email protected]> +Date: Wed, 18 Nov 2015 18:53:13 +0000 +Subject: Disable HTML timestamps. + +Reason: makes build reproducible. +--- + doc/Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in +index ff07a28..5346e9a 100644 +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -1130,7 +1130,7 @@ HTML_COLORSTYLE_GAMMA = 80 + # The default value is: YES. + # This tag requires that the tag GENERATE_HTML is set to YES. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML + # documentation will contain sections that can be hidden and shown after the diff --git a/debian/patches/Explicit-64-bit-shifts-for-flags.patch b/debian/patches/Explicit-64-bit-shifts-for-flags.patch new file mode 100644 index 0000000..1f244e0 --- /dev/null +++ b/debian/patches/Explicit-64-bit-shifts-for-flags.patch @@ -0,0 +1,89 @@ +From: Martyn Klassen <[email protected]> +Date: Mon, 29 Jun 2015 17:00:46 -0400 +Subject: Explicit 64 bit shifts for flags + +--- + libsrc/ismrmrd.c | 10 +++++----- + tests/test_flags.cpp | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libsrc/ismrmrd.c b/libsrc/ismrmrd.c +index 3fba17c..303a9a3 100644 +--- a/libsrc/ismrmrd.c ++++ b/libsrc/ismrmrd.c +@@ -474,7 +474,7 @@ size_t ismrmrd_sizeof_data_type(int data_type) + + /* Misc. functions */ + bool ismrmrd_is_flag_set(const uint64_t flags, const uint64_t val) { +- uint64_t bitmask = 1 << (val - 1); ++ uint64_t bitmask = (uint64_t)(1) << (val - 1); + return (flags & bitmask) > 0; + } + +@@ -483,7 +483,7 @@ int ismrmrd_set_flag(uint64_t *flags, const uint64_t val) { + if (flags==NULL) { + return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer should not be NULL."); + } +- bitmask = 1 << (val - 1); ++ bitmask = (uint64_t)(1) << (val - 1); + *flags |= bitmask; + return ISMRMRD_NOERROR; + } +@@ -501,7 +501,7 @@ int ismrmrd_clear_flag(uint64_t *flags, const uint64_t val) { + if (flags==NULL) { + return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer should not be NULL."); + } +- bitmask = 1 << (val - 1); ++ bitmask = (uint64_t)(1) << (val - 1); + *flags &= ~bitmask; + return ISMRMRD_NOERROR; + } +@@ -520,7 +520,7 @@ bool ismrmrd_is_channel_on(const uint64_t channel_mask[ISMRMRD_CHANNEL_MASKS], c + if (channel_mask==NULL) { + return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer to channel_mask should not be NULL."); + } +- bitmask = 1 << (chan % 64); ++ bitmask = (uint64_t)(1) << (chan % 64); + offset = chan / 64; + return (channel_mask[offset] & bitmask) > 0; + } +@@ -531,7 +531,7 @@ int ismrmrd_set_channel_on(uint64_t channel_mask[ISMRMRD_CHANNEL_MASKS], const u + if (channel_mask==NULL) { + return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer to channel_mask should not be NULL."); + } +- bitmask = 1 << (chan % 64); ++ bitmask = (uint64_t)(1) << (chan % 64); + offset = chan / 64; + channel_mask[offset] |= bitmask; + return ISMRMRD_NOERROR; +diff --git a/tests/test_flags.cpp b/tests/test_flags.cpp +index 7402f0a..6c7dc32 100644 +--- a/tests/test_flags.cpp ++++ b/tests/test_flags.cpp +@@ -15,7 +15,7 @@ BOOST_AUTO_TEST_CASE(test_is_flag_set) + } + + for (int f = 1; f <= 64; f++) { +- flags |= (1 << (f - 1)); ++ flags |= ((uint64_t)1 << (f - 1)); + BOOST_CHECK_EQUAL(ismrmrd_is_flag_set(flags, f), true); + } + } +@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(test_set_flag) + + for (int f = 1; f <= 64; f++) { + BOOST_CHECK_EQUAL(ismrmrd_set_flag(&flags, f), ISMRMRD_NOERROR); +- BOOST_REQUIRE((flags & (1 << (f - 1))) != 0); ++ BOOST_REQUIRE((flags & ((uint64_t)1 << (f - 1))) != 0); + } + } + +@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(test_clear_flag) + BOOST_CHECK_EQUAL(ismrmrd_clear_flag(NULL, ISMRMRD_IMAGE_USER8), ISMRMRD_RUNTIMEERROR); + for (int f = 1; f <= 64; f++) { + BOOST_CHECK_EQUAL(ismrmrd_clear_flag(&flags, f), ISMRMRD_NOERROR); +- BOOST_REQUIRE((flags & (1 << (f - 1))) == 0); ++ BOOST_REQUIRE((flags & ((uint64_t)1 << (f - 1))) == 0); + } + } + diff --git a/debian/patches/cmake-install-docs.patch b/debian/patches/cmake-install-docs.patch deleted file mode 100644 index efacaa7..0000000 --- a/debian/patches/cmake-install-docs.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: enable installation of generated documentation - By default, the documentation targets do no install the generated - documentation. This patch adds this missing installation step. The - documentation gets installed under the projects data folder, i.e - $(CMAKE_INSTALL_PREFIX)/share/ismrmrd/doc. -Author: Ghislain Antony Vaillant <[email protected]> -Forwarded: not-needed ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -9,6 +9,9 @@ - COMMAND ${CMAKE_COMMAND} -E make_directory ${API_DOC_DIR} - COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE} - COMMENT "Generating API documentation using Doxygen" VERBATIM) -+ -+ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION share/ismrmrd/doc) -+ - else(DOXYGEN_FOUND) - MESSAGE(STATUS "Doxygen not found. Not able to build API documentation") - endif(DOXYGEN_FOUND) diff --git a/debian/patches/fixing-check-after-free-in-unit-tests.patch b/debian/patches/fixing-check-after-free-in-unit-tests.patch deleted file mode 100644 index f3346cb..0000000 --- a/debian/patches/fixing-check-after-free-in-unit-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4bbea526d1b5c1e057dd1b379dc892b2eb025c3b Mon Sep 17 00:00:00 2001 -From: Joseph Naegele <[email protected]> -Date: Fri, 18 Sep 2015 09:02:52 -0400 -Subject: [PATCH] fixing check after free in unit tests - ---- - tests/test_acquisitions.cpp | 2 -- - tests/test_images.cpp | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/tests/test_acquisitions.cpp b/tests/test_acquisitions.cpp -index 7cc5532..1fc37f2 100644 ---- a/tests/test_acquisitions.cpp -+++ b/tests/test_acquisitions.cpp -@@ -59,8 +59,6 @@ BOOST_AUTO_TEST_CASE(test_acquisition_create_free) - // Check cleanup - BOOST_CHECK_EQUAL(ismrmrd_free_acquisition(NULL), ISMRMRD_RUNTIMEERROR); - BOOST_CHECK_EQUAL(ismrmrd_free_acquisition(cacqp), ISMRMRD_NOERROR); -- BOOST_CHECK(!cacqp->traj); -- BOOST_CHECK(!cacqp->data); - } - - BOOST_AUTO_TEST_CASE(test_acquisition_copy) -diff --git a/tests/test_images.cpp b/tests/test_images.cpp -index 374c603..7c6a908 100644 ---- a/tests/test_images.cpp -+++ b/tests/test_images.cpp -@@ -59,8 +59,6 @@ BOOST_AUTO_TEST_CASE(test_image_create_free) - // Check cleanup - BOOST_CHECK_EQUAL(ismrmrd_free_image(NULL), ISMRMRD_RUNTIMEERROR); - BOOST_CHECK_EQUAL(ismrmrd_free_image(cimgp), ISMRMRD_NOERROR); -- BOOST_CHECK(!cimgp->attribute_string); -- BOOST_CHECK(!cimgp->data); - } - - BOOST_AUTO_TEST_CASE(test_image_copy) --- -2.5.1 - diff --git a/debian/patches/make-build-reproducible.patch b/debian/patches/make-build-reproducible.patch deleted file mode 100644 index 97ecdda..0000000 --- a/debian/patches/make-build-reproducible.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: make build reproducible - Removes timestamp in documentation generated by Doxygen. -Author: Ghislain Antony Vaillant <[email protected]> -Forwarded: not-needed ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/doc/Doxyfile.in -+++ b/doc/Doxyfile.in -@@ -1130,7 +1130,7 @@ - # The default value is: YES. - # This tag requires that the tag GENERATE_HTML is set to YES. - --HTML_TIMESTAMP = YES -+HTML_TIMESTAMP = NO - - # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML - # documentation will contain sections that can be hidden and shown after the diff --git a/debian/patches/series b/debian/patches/series index a716125..e073a99 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -make-build-reproducible.patch -cmake-install-docs.patch -fixing-check-after-free-in-unit-tests.patch +Disable-HTML-timestamps.patch +Explicit-64-bit-shifts-for-flags.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ismrmrd.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
