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

Don't rely on a pkg-config output formatting detail #815

Merged
merged 1 commit into from Jan 24, 2019
Merged

Don't rely on a pkg-config output formatting detail #815

merged 1 commit into from Jan 24, 2019

Conversation

b4n
Copy link
Member

@b4n b4n commented Jan 23, 2019

Do not require pkg-config to emit spaces around elements in its --print-requires output.

This should fix Geany GTK version check on OpenBSD 6.4.

@andy5995 could you check this and see if it helps? Once configured, you should get something like that (obviously with GTK2 version of it if you've got a GTK2 build):

$ grep ^GP_GTK_ config.log 
GP_GTK_PACKAGE='gtk+-3.0'
GP_GTK_VERSION='3.0'
GP_GTK_VERSION_MAJOR='3'

@b4n
Don't rely on a pkg-config output formatting detail
24e0ba4 
Do not require pkg-config to emit spaces around elements in its
`--print-requires` output.

This should fix Geany GTK version check on OpenBSD 6.4.
@b4n b4n added this to the 1.35.0 milestone Jan 23, 2019
@b4n b4n mentioned this pull request Jan 23, 2019
Merged
andy5995
andy5995 approved these changes Jan 24, 2019
View reviewed changes
Copy link
Contributor

@andy5995 andy5995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, works

andy:21$ grep ^GP_GTK_ config.log 
GP_GTK_PACKAGE='gtk+-3.0'
GP_GTK_VERSION='3.0'
GP_GTK_VERSION_MAJOR='3'

@b4n b4n merged commit 24e0ba4 into geany:master Jan 24, 2019
@b4n b4n self-assigned this Jan 24, 2019
@b4n b4n added the build system Automake build system issues label Jan 24, 2019
@b4n
Copy link
Member Author

b4n commented Jan 24, 2019

@andy5995 thanks for testing!

@andy5995
Copy link
Contributor

You're welcome!

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

@andy5995 andy5995 andy5995 approved these changes

Assignees

@b4n b4n

Labels
build system Automake build system issues
Projects
None yet
Milestone
1.35.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@b4n @andy5995