haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libgit2, cleanup (#7984)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-03-19 06:55:53 +01:00
committed by GitHub
parent f51e489a47
commit e844713644
5 changed files with 0 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
dev-libs/libgit2/patches/libgit2-0.26.3.patchset
View File

@@ -1,71 +0,0 @@
From 4036019821be1f94bed724e2ebdb2a3b6ff41670 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 10 May 2018 10:21:34 +0200
Subject: Reorder some includes to avoid conflicts between zlib and openssl
zlib #defines free_func, but ssl headers use free_func in a parameter
name in some places. This ends up confusing gcc2. Make sure the ssl
headers are included before the define is set, so we can build libgit
with gcc2.
diff --git a/src/fetch.c b/src/fetch.c
index f408a51..9bf58fc 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -5,6 +5,8 @@
* a Linking Exception. For full terms see the included COPYING file.
*/
+#include "netops.h"
+
#include "git2/oid.h"
#include "git2/refs.h"
#include "git2/revwalk.h"
@@ -15,7 +17,6 @@
#include "refspec.h"
#include "pack.h"
#include "fetch.h"
-#include "netops.h"
#include "repository.h"
#include "refs.h"
diff --git a/src/pack-objects.h b/src/pack-objects.h
index e1e0ee3..399a035 100644
--- a/src/pack-objects.h
+++ b/src/pack-objects.h
@@ -8,12 +8,13 @@
#ifndef INCLUDE_pack_objects_h__
#define INCLUDE_pack_objects_h__
+#include "netops.h"
+
#include "common.h"
#include "buffer.h"
#include "hash.h"
#include "oidmap.h"
-#include "netops.h"
#include "zstream.h"
#include "pool.h"
#include "indexer.h"
diff --git a/src/push.c b/src/push.c
index 433cc06..a112fc1 100644
--- a/src/push.c
+++ b/src/push.c
@@ -5,11 +5,12 @@
* a Linking Exception. For full terms see the included COPYING file.
*/
+#include "pack-objects.h"
+
#include "git2.h"
#include "common.h"
#include "pack.h"
-#include "pack-objects.h"
#include "remote.h"
#include "vector.h"
#include "push.h"
--
2.16.2

72
dev-libs/libgit2/patches/libgit2-0.27.0.patchset
View File

@@ -1,72 +0,0 @@
From 4036019821be1f94bed724e2ebdb2a3b6ff41670 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 10 May 2018 10:21:34 +0200
Subject: Reorder some includes to avoid conflicts between zlib and openssl
zlib #defines free_func, but ssl headers use free_func in a parameter
name in some places. This ends up confusing gcc2. Make sure the ssl
headers are included before the define is set, so we can build libgit
with gcc2.
diff --git a/src/fetch.c b/src/fetch.c
index 0b22b36..67fdfbf 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -5,6 +5,7 @@
* a Linking Exception. For full terms see the included COPYING file.
*/
+#include "netops.h"
#include "fetch.h"
#include "git2/oid.h"
@@ -15,7 +16,6 @@
#include "remote.h"
#include "refspec.h"
#include "pack.h"
-#include "netops.h"
#include "repository.h"
#include "refs.h"
diff --git a/src/pack-objects.h b/src/pack-objects.h
index c9cd577..419e8a5 100644
--- a/src/pack-objects.h
+++ b/src/pack-objects.h
@@ -8,12 +8,13 @@
#ifndef INCLUDE_pack_objects_h__
#define INCLUDE_pack_objects_h__
+#include "netops.h"
+
#include "common.h"
#include "buffer.h"
#include "hash.h"
#include "oidmap.h"
-#include "netops.h"
#include "zstream.h"
#include "pool.h"
#include "indexer.h"
diff --git a/src/push.c b/src/push.c
index 85b683e..9eab56e 100644
--- a/src/push.c
+++ b/src/push.c
@@ -5,12 +5,13 @@
* a Linking Exception. For full terms see the included COPYING file.
*/
+#include "pack-objects.h"
+
#include "push.h"
#include "git2.h"
#include "pack.h"
-#include "pack-objects.h"
#include "remote.h"
#include "vector.h"
#include "tree.h"
--
2.16.2