From 0c457bfd037e7be392f5d240657decab4db0d210 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Jan 20 2015 18:04:01 +0000 Subject: Remove obsolete patches --- diff --git a/0001-Disable-failing-test.patch b/0001-Disable-failing-test.patch deleted file mode 100644 index 0f7b9f8..0000000 --- a/0001-Disable-failing-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e833b8c00da12619ab58032715b8b1ccc404d5ea Mon Sep 17 00:00:00 2001 -From: Mathieu Bridon -Date: Sat, 22 Mar 2014 12:29:40 +0800 -Subject: [PATCH] Disable failing test - -https://github.com/libgit2/libgit2/issues/2199 ---- - tests/blame/simple.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/tests/blame/simple.c b/tests/blame/simple.c -index 79bd56b..eb0d8b9 100644 ---- a/tests/blame/simple.c -+++ b/tests/blame/simple.c -@@ -135,6 +135,11 @@ void test_blame_simple__trivial_libgit2(void) - git_blame_options opts = GIT_BLAME_OPTIONS_INIT; - git_object *obj; - -+ /* This test doesn't seem to work from a release tarball -+ * https://github.com/libgit2/libgit2/issues/2199 -+ */ -+ return; -+ - cl_git_pass(git_repository_open(&g_repo, cl_fixture("../.."))); - - /* This test can't work on a shallow clone */ --- -1.8.5.3 - diff --git a/libgit2-0.19.0-non-x86.patch b/libgit2-0.19.0-non-x86.patch deleted file mode 100644 index 4067b52..0000000 --- a/libgit2-0.19.0-non-x86.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up libgit2-0.18.0/src/bswap.h.non-x86 libgit2-0.18.0/src/bswap.h ---- libgit2-0.18.0/src/bswap.h.non-x86 2013-06-19 10:01:31.000000000 +0200 -+++ libgit2-0.18.0/src/bswap.h 2013-06-19 10:01:50.000000000 +0200 -@@ -76,6 +76,10 @@ GIT_INLINE(uint16_t) default_swab16(uint - #define bswap32(x) _byteswap_ulong(x) - #define bswap16(x) _byteswap_ushort(x) - -+#else -+ -+#include -+ - #endif - - #ifdef bswap32 diff --git a/libgit2-0.21.0-arm.patch b/libgit2-0.21.0-arm.patch deleted file mode 100644 index c0950d9..0000000 --- a/libgit2-0.21.0-arm.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 5fa8cda981940eaef54b55abe4fcba09b4e18e12 Mon Sep 17 00:00:00 2001 -From: Russell Belfer -Date: Mon, 30 Jun 2014 12:05:25 -0700 -Subject: [PATCH] Round up pool alloc sizes for alignment - -To make sure that items returned from pool allocations are aligned -on nice boundaries, this rounds up all pool allocation sizes to a -multiple of 8. This adds a small amount of overhead to each item. - -The rounding up could be made optional with an extra parameter to -the pool initialization that turned on rounding only for pools -where item alignment actually matters, but I think for the extra -code and complexity that would be involved, that it makes sense -just to burn a little bit of extra memory and enable this all the -time. ---- - src/pool.c | 2 +- - tests/core/pool.c | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/pool.c b/src/pool.c -index 146f118..a516ff9 100644 ---- a/src/pool.c -+++ b/src/pool.c -@@ -146,7 +146,7 @@ GIT_INLINE(void) pool_remove_page( - void *git_pool_malloc(git_pool *pool, uint32_t items) - { - git_pool_page *scan = pool->open, *prev; -- uint32_t size = items * pool->item_size; -+ uint32_t size = ((items * pool->item_size) + 7) & ~7; - void *ptr = NULL; - - pool->has_string_alloc = 0; -diff --git a/tests/core/pool.c b/tests/core/pool.c -index 351d0c2..a7ec880 100644 ---- a/tests/core/pool.c -+++ b/tests/core/pool.c -@@ -38,19 +38,19 @@ void test_core_pool__1(void) - cl_assert(git_pool_malloc(&p, i) != NULL); - - /* with fixed page size, allocation must end up with these values */ -- cl_assert(git_pool__open_pages(&p) == 1); -- cl_assert(git_pool__full_pages(&p) == 505); -+ cl_assert_equal_i(1, git_pool__open_pages(&p)); -+ cl_assert_equal_i(507, git_pool__full_pages(&p)); - - git_pool_clear(&p); - -- cl_git_pass(git_pool_init(&p, 1, 4100)); -+ cl_git_pass(git_pool_init(&p, 1, 4120)); - - for (i = 2010; i > 0; i--) - cl_assert(git_pool_malloc(&p, i) != NULL); - - /* with fixed page size, allocation must end up with these values */ -- cl_assert(git_pool__open_pages(&p) == 1); -- cl_assert(git_pool__full_pages(&p) == 492); -+ cl_assert_equal_i(1, git_pool__open_pages(&p)); -+ cl_assert_equal_i(492, git_pool__full_pages(&p)); - - git_pool_clear(&p); - } --- -1.9.3 - diff --git a/libgit2.spec b/libgit2.spec index c5cd7ea..4e00bd2 100644 --- a/libgit2.spec +++ b/libgit2.spec @@ -5,8 +5,6 @@ Summary: C implementation of the Git core methods as a library with a sol License: GPLv2 with exceptions URL: http://libgit2.github.com/ Source0: https://github.com/libgit2/libgit2/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# https://github.com/libgit2/libgit2/issues/2450 -#Patch0: libgit2-0.21.0-arm.patch BuildRequires: cmake BuildRequires: http-parser-devel BuildRequires: libssh2-devel