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

Make GTK3 build the default, and GTK2 build optional #2610

Merged
merged 1 commit into from Oct 4, 2020

Conversation

codebrainz
Copy link
Member

As discussed in #2602, make GTK+3 the default of the build system, leading up to the eventual removal of GTK+2 support.

The --enable-gtk3 configuration option is replaced with --enable-gtk2. If --enable-gtk2 is specified, the GTK+2 development libraries/headers must be available via pkg-config or else configuration will fail. If --enable-gtk2 is not specified, the GTK+3 development libraries/headers must be available or else configuration will fail. It intentionally does not fall back to GTK+2 automatically.

@codebrainz codebrainz added the gtk label Oct 2, 2020
@codebrainz codebrainz added this to the 1.37 milestone Oct 2, 2020
@codebrainz codebrainz self-assigned this Oct 2, 2020
@codebrainz codebrainz mentioned this pull request Oct 2, 2020
@codebrainz codebrainz added this to In Progress in Remove GTK2 Oct 2, 2020
@codebrainz
Copy link
Member Author

codebrainz commented Oct 2, 2020

I don't know why the Mingw CI build is not getting the gmodule-no-export-2.0 flags which should make it link to -lgmodule-2.0.

@elextr
Copy link
Member

elextr commented Oct 2, 2020

@codebrainz its configured GTK 3.8.2 which is pretty olde, is that the problem?

Copy link
Member

@eht16 eht16 left a comment

Choose a reason for hiding this comment

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

GTK 3.8.2 is not the problem as we use it on all other Travis builds as well and they work fine.

I was able to reproduce this error with a ubuntu:trusty Docker container after replicating the steps the Travis build does. Though I don't see the cause for the error. My best guess is that any of the changes in configure.ac breaks the linking.

EDIT: found the cause for the linking errors, see #2610 (comment).

scripts/cross-build-mingw.sh Show resolved Hide resolved
configure.ac Outdated Show resolved Hide resolved
@codebrainz
Copy link
Member Author

Should be all good now. Let me know if/when I should merge it or if there's anything else.

@elextr
Copy link
Member

elextr commented Oct 3, 2020

LGBCI (Cursory)

@eht16
Copy link
Member

eht16 commented Oct 4, 2020

Looks fine now and even works :).
💯 for the rewritten GTK2 bundle download which is way easier to understand now.

Fine to me to merge.

* Replace `--enable-gtk3` with `--enable-gtk2`
* Update Travis CI builds
* Change `cross-build-mingw.sh` default to GTK3 and cleanup a little

After this commit it will be required to pass `--enable-gtk2` to
the Autoconf script in order to build with GTK+2, otherwise GTK+3
will be required.
@codebrainz
Copy link
Member Author

Rebased on master, squashed commits, updated commit message, and force-pushed.

Will merge once CI completes.

@codebrainz codebrainz merged commit 8184f91 into geany:master Oct 4, 2020
Remove GTK2 automation moved this from In Progress to Done Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants