Attachment 907531 Details for Bug 1104603 – Patch fixing tests on BE

[patch] Patch fixing tests on BE

0001-Fixed-build-on-BE.patch (text/plain), 4.06 KB, created by Jakub Čajka on 2014-06-11 08:20:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-06-11 08:20:34 UTC

Size: 4.06 KB

patch

obsolete

>From b0c7ed681c14c13e0404ba40d8a48a277b7aa2eb Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Wed, 11 Jun 2014 09:23:37 +0200
>Subject: [PATCH] Fixed build on BE
>
>---
> libgit2-0.20.0-BE-fix.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++
> libgit2.spec                | 10 +++++++-
> 2 files changed, 69 insertions(+), 1 deletion(-)
> create mode 100644 libgit2-0.20.0-BE-fix.patch
>
>diff --git a/libgit2-0.20.0-BE-fix.patch b/libgit2-0.20.0-BE-fix.patch
>new file mode 100644
>index 0000000..83fc560
>--- /dev/null
>+++ b/libgit2-0.20.0-BE-fix.patch
>@@ -0,0 +1,60 @@
>+diff -up libgit2-0.20.0/include/git2/blame.h.ppc libgit2-0.20.0/include/git2/blame.h
>+--- libgit2-0.20.0/include/git2/blame.h.ppc	2014-06-10 13:24:13.657519398 +0200
>++++ libgit2-0.20.0/include/git2/blame.h	2014-06-10 13:24:41.790577643 +0200
>+@@ -131,7 +131,7 @@ GIT_EXTERN(uint32_t) git_blame_get_hunk_
>+  */
>+ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byindex(
>+ 		git_blame *blame,
>+-		uint32_t index);
>++		size_t index);
>+ 
>+ /**
>+  * Gets the hunk that relates to the given line number in the newest commit.
>+@@ -142,7 +142,7 @@ GIT_EXTERN(const git_blame_hunk*) git_bl
>+  */
>+ GIT_EXTERN(const git_blame_hunk*) git_blame_get_hunk_byline(
>+ 		git_blame *blame,
>+-		uint32_t lineno);
>++		size_t lineno);
>+ 
>+ /**
>+  * Get the blame for a single file.
>+diff -up libgit2-0.20.0/src/blame.c.ppc libgit2-0.20.0/src/blame.c
>+--- libgit2-0.20.0/src/blame.c.ppc	2014-06-10 13:22:59.434366395 +0200
>++++ libgit2-0.20.0/src/blame.c	2014-06-10 13:23:35.262440126 +0200
>+@@ -151,19 +151,19 @@ uint32_t git_blame_get_hunk_count(git_bl
>+ 	return (uint32_t)blame->hunks.length;
>+ }
>+ 
>+-const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, uint32_t index)
>++const git_blame_hunk *git_blame_get_hunk_byindex(git_blame *blame, size_t index)
>+ {
>+ 	assert(blame);
>+ 	return (git_blame_hunk*)git_vector_get(&blame->hunks, index);
>+ }
>+ 
>+-const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, uint32_t lineno)
>++const git_blame_hunk *git_blame_get_hunk_byline(git_blame *blame, size_t lineno)
>+ {
>+-	size_t i;
>++	size_t i = 0;
>+ 	assert(blame);
>+ 
>+ 	if (!git_vector_bsearch2( &i, &blame->hunks, hunk_byfinalline_search_cmp, &lineno)) {
>+-		return git_blame_get_hunk_byindex(blame, (uint32_t)i);
>++	    return git_blame_get_hunk_byindex(blame, i);
>+ 	}
>+ 
>+ 	return NULL;
>+diff -up libgit2-0.20.0/tests/merge/merge_helpers.c.ppc libgit2-0.20.0/tests/merge/merge_helpers.c
>+--- libgit2-0.20.0/tests/merge/merge_helpers.c.ppc	2014-06-10 13:39:25.318320779 +0200
>++++ libgit2-0.20.0/tests/merge/merge_helpers.c	2014-06-10 13:44:13.623903954 +0200
>+@@ -298,7 +298,7 @@ int merge_test_reuc(git_index *index, co
>+ 
>+ int dircount(void *payload, git_buf *pathbuf)
>+ {
>+-	int *entries = payload;
>++	size_t *entries = payload;
>+ 	size_t len = git_buf_len(pathbuf);
>+ 
>+ 	if (len < 5 || strcmp(pathbuf->ptr + (git_buf_len(pathbuf) - 5), "/.git") != 0)
>diff --git a/libgit2.spec b/libgit2.spec
>index f57d8bc..59c2102 100644
>--- a/libgit2.spec
>+++ b/libgit2.spec
>@@ -2,7 +2,7 @@
> 
> Name: libgit2
> Version: 0.20.0
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Summary: A C implementation of the Git core methods as a library
> 
> License: GPLv2 with exceptions
>@@ -15,6 +15,9 @@ Patch0: 0001-Disable-failing-test.patch
> # Add htonl() and friends declarations on non-x86 arches
> Patch1: libgit2-0.19.0-non-x86.patch
> 
>+# Fixes tests and problems caused by type casts
>+Patch2: libgit2-0.20.0-BE-fix.patch
>+
> BuildRequires: cmake >= 2.6
> BuildRequires: http-parser-devel
> BuildRequires: libssh2-devel
>@@ -49,6 +52,8 @@ find examples -name ".gitignore" -delete
> %patch0 -p1 -b .test
> %patch1 -p1 -b .non-x86
> 
>+%patch2 -p1 -b .ppc
>+
> # Fix pkgconfig generation
> sed -i 's|@CMAKE_INSTALL_PREFIX@/||' libgit2.pc.in
> 
>@@ -89,6 +94,9 @@ make install DESTDIR=%{buildroot}
> 
> 
> %changelog
>+* Wed Jun 11 2014 Jakub Äajka <jcajka@redhat.com> - 0.20.0-4
>+- Fixed tests related problems on BE. (BZ#1104603)
>+
> * Thu Mar 27 2014 Mathieu Bridon <bochecha@fedoraproject.org> - 0.20.0-3
> - Fix build requirement on libssh2-devel. (RHBZ#1039433)
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1104603: 907531