Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zsh: bump #6709

Merged
merged 4 commits into from
May 28, 2022
Merged

zsh: bump #6709

merged 4 commits into from
May 28, 2022

Conversation

extrowerk
Copy link
Member

No description provided.

@Begasus
Copy link
Contributor

Begasus commented Mar 13, 2022

This needs util_linux for cmd:col (so this conflicts with libuuid (needed for gimp)), also parse error on gcc2 ...

EDIT fix for gcc2 build (only 1 parse error there atm)

From 507c779914103e824e80315e5135e52c5889b1ce Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 13 Mar 2022 15:56:24 +0000
Subject: zsh, fix for gcc2


diff --git a/Src/jobs.c b/Src/jobs.c
index 96837e9..d830d39 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -2933,6 +2933,7 @@ acquire_pgrp(void)
 	sigaddset(&blockset, SIGTTOU);
 	sigaddset(&blockset, SIGTSTP);
 	oldset = signal_block(blockset);
+	{
 	int loop_count = 0;
 	while ((ttpgrp = gettygrp()) != -1 && ttpgrp != mypgrp) {
 	    mypgrp = GETPGRP();
@@ -2966,6 +2967,7 @@ acquire_pgrp(void)
 	    }
 	    lastpgrp = mypgrp;
 	}
+	}
 	if (mypgrp != mypid) {
 	    if (setpgrp(0, 0) == 0) {
 		mypgrp = mypid;
-- 
2.30.2

@Begasus Begasus merged commit 6a7d084 into haikuports:master May 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants