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.

Sign up for GitHub

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

Jump to bottom

meson: check scdoc version #3788

Merged
merged 1 commit into from
Mar 1, 2019
Merged

meson: check scdoc version #3788

merged 1 commit into from
Mar 1, 2019

Conversation

emersion
Copy link
Member

No description provided.

@emersion emersion force-pushed the meson-check-scdoc-version branch 3 times, most recently from f5976e5 to 752fd0f Compare February 27, 2019 21:24
@emersion
Copy link
Member Author

@jbeich It seems scdoc's pkg-config file contains errors on FreeBSD. See https://builds.sr.ht/~sircmpwn/job/33711

@emersion
Copy link
Member Author

In the meantime, pushed a fix not to use pkg-config to find scdoc's path.

@emersion emersion mentioned this pull request Feb 28, 2019
Closed
@jbeich
Copy link
Contributor

jbeich commented Feb 28, 2019 •
edited
Loading

@emersion, I've fixed pkg-config's file and updated to 1.9.1. Expect FreeBSD package to catch up around 2019-03-03 (details).

@emersion
Copy link
Member Author

Wow, thanks a lot, that was fast :)

@RedSoxFan
Copy link
Member

Do you want this merged now or wait for FreeBSD (and possibly #3792)?

@emersion
Copy link
Member Author

emersion commented Mar 1, 2019

Hmm. Problem is, we'll probably fail builds on many platforms until all of them get a patched (non-1.9.1) scdoc. We'll probably need to build scdoc from source because of this…

I think it'd be better to merge this as-is and improve it when the situation settles.

@emersion
Copy link
Member Author

emersion commented Mar 1, 2019

Related: https://todo.sr.ht/~sircmpwn/scdoc/23

@RedSoxFan
Copy link
Member

I think it'd be better to merge this as-is and improve it when the situation settles.

Sounds good

@RedSoxFan RedSoxFan merged commit f98410c into swaywm:master Mar 1, 2019
@RedSoxFan
Copy link
Member

Thanks!

@emersion emersion deleted the meson-check-scdoc-version branch March 1, 2019 20:50
@emersion
Copy link
Member Author

emersion commented Mar 1, 2019

Submitted a patch to fix the pkg-config file: https://lists.sr.ht/~sircmpwn/public-inbox/%3C0k4nGuwl8cWAr8T9PlSbYQt33rnRn7rYoWEw-kKZ4WrhEK4Oco6AudUzWFmBKN8_7N_uJNcc_xY7iwzAE3s_2gD1Ie7NyDsAsdWjme3Vxss%3D%40emersion.fr%3E

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RedSoxFan RedSoxFan RedSoxFan approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@emersion @jbeich @RedSoxFan