beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Ports/git: Update git to version 2.39.0

Browse source
This commit is contained in:
EWouters 2022-12-13 05:05:32 +01:00 committed by Andreas Kling
parent ad120606fd
commit 9a849c10ae
Notes: sideshowbarker 2024-07-17 12:02:22 +09:00 
Author: https://github.com/EWouters
Commit: https://github.com/SerenityOS/serenity/commit/9a849c10ae
Pull-request: https://github.com/SerenityOS/serenity/pull/16460
4 changed files with 50 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -77,7 +77,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`genemu`](genemu/) | Genesis / MegaDrive Emulator | e39f690 | https://github.com/rasky/genemu |
| [`genext2fs`](genext2fs/) | genext2fs | 1.5.0 | https://github.com/bestouff/genext2fs |
| [`gettext`](gettext/) | GNU gettext | 0.21 | https://www.gnu.org/software/gettext/ |
| [`git`](git/) | Git | 2.36.1 | https://git-scm.com/ |
| [`git`](git/) | Git | 2.39.0 | https://git-scm.com/ |
| [`glib`](glib/) | GLib | 2.74.1 | https://wiki.gnome.org/Projects/GLib |
| [`glm`](glm/) | OpenGL Mathematics (GLM) | 0.9.9.8 | https://github.com/g-truc/glm |
| [`gltron`](gltron/) | GLTron | 0.70 | http://gltron.org |

4
Ports/git/package.sh
View file

@ -1,7 +1,7 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='git'
version='2.36.1'
files="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz git-${version}.tar.xz 405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370"
version='2.39.0'
files="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz git-${version}.tar.xz ba199b13fb5a99ca3dec917b0bd736bc0eb5a9df87737d435eddfdf10d69265b"
auth_type='sha256'
useconfigure='true'
configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-lib=${SERENITY_INSTALL_ROOT}/usr/local" "CFLAGS=-DNO_IPV6" "LDFLAGS=-L${SERENITY_INSTALL_ROOT}/usr/local/lib")

72
Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch
View file

@ -5,44 +5,48 @@ Subject: [PATCH] Remove some unimplemented function calls
i.e. f(un)lockfile stubs and setitimer.
---
builtin/log.c | 2 --
git-compat-util.h | 8 --------
progress.c | 2 --
3 files changed, 12 deletions(-)
builtin/log.c | 6 ------
git-compat-util.h | 8 --------
progress.c | 14 --------------
3 files changed, 28 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index c211d66..9755174 100644
index 89447a50838562795bb80172db8102ff7a42e91b..3552e1807860b30eb18366487e5476346290bcea 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -373,7 +373,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
@@ -430,9 +430,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
* trigger every second even if we're blocked on a
* reader!
*/
early_output_timer.it_value.tv_sec = 0;
early_output_timer.it_value.tv_usec = 500000;
- early_output_timer.it_value.tv_sec = 0;
- early_output_timer.it_value.tv_usec = 500000;
- setitimer(ITIMER_REAL, &early_output_timer, NULL);
}
static void early_output(int signal)
@@ -407,7 +406,6 @@ static void setup_early_output(void)
@@ -464,9 +461,6 @@ static void setup_early_output(void)
*
* This is a one-time-only trigger.
*/
early_output_timer.it_value.tv_sec = 0;
early_output_timer.it_value.tv_usec = 100000;
- early_output_timer.it_value.tv_sec = 0;
- early_output_timer.it_value.tv_usec = 100000;
- setitimer(ITIMER_REAL, &early_output_timer, NULL);
}
static void finish_early_output(struct rev_info *rev)
diff --git a/git-compat-util.h b/git-compat-util.h
index 58fd813..0a0f007 100644
index a76d0526f79266e1dc512072a4236876df8f8726..596ac243f673d30748e3792d7926ea1b22d4911e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1350,14 +1350,6 @@ int open_nofollow(const char *path, int flags);
@@ -1471,14 +1471,6 @@ int open_nofollow(const char *path, int flags);
#endif
#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-static inline void flockfile(FILE *fh)
-static inline void flockfile(FILE *fh UNUSED)
-{
- ; /* nothing */
-}
-static inline void funlockfile(FILE *fh)
-static inline void funlockfile(FILE *fh UNUSED)
-{
- ; /* nothing */
-}
@ -50,22 +54,38 @@ index 58fd813..0a0f007 100644
#endif
diff --git a/progress.c b/progress.c
index 0cdd875..19a2a67 100644
index 0cdd875d37f166bedbbeb5f0e889046674ed58be..4b7f5b0b5a48b1b895befef12217e5822d118563 100644
--- a/progress.c
+++ b/progress.c
@@ -83,7 +83,6 @@ static void set_progress_signal(void)
v.it_interval.tv_sec = 1;
v.it_interval.tv_usec = 0;
v.it_value = v.it_interval;
@@ -67,7 +67,6 @@ static void progress_interval(int signum)
static void set_progress_signal(void)
{
struct sigaction sa;
- struct itimerval v;
if (progress_testing)
return;
@@ -79,23 +78,10 @@ static void set_progress_signal(void)
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sigaction(SIGALRM, &sa, NULL);
-
- v.it_interval.tv_sec = 1;
- v.it_interval.tv_usec = 0;
- v.it_value = v.it_interval;
- setitimer(ITIMER_REAL, &v, NULL);
}
static void clear_progress_signal(void)
@@ -93,7 +92,6 @@ static void clear_progress_signal(void)
if (progress_testing)
return;
{
- struct itimerval v = {{0,},};
-
- if (progress_testing)
- return;
-
- setitimer(ITIMER_REAL, &v, NULL);
signal(SIGALRM, SIG_IGN);
progress_update = 0;
- signal(SIGALRM, SIG_IGN);
- progress_update = 0;
}
static int is_foreground_fd(int fd)

2
Ports/git/patches/0002-Remove-uname-detection-in-config.mak.uname.patch
View file

@ -8,7 +8,7 @@ Subject: [PATCH] Remove uname detection in config.mak.uname
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 259d151..b072f4c 100644
index d63629fe807f59deda80ed780c1915df011bf862..eae96e0ab2986c4b96a9786715cf778acdb18736 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -4,12 +4,12 @@