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

gtk3: partially revert d0aca00 #26062

Closed
wants to merge 1 commit into from
Closed

gtk3: partially revert d0aca00 #26062

wants to merge 1 commit into from

Conversation

cooljeanius
Copy link
Contributor

Closes: https://trac.macports.org/ticket/70274

Description

PR #23864 added 2 active variants checks to gtk3 on glib2, but really only one of them was needed. This PR removes the unnecessary one.

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 11.7.10 20G1427 x86_64
Xcode 13.2.1 13C100

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL in commit message?
  • checked your Portfile with port lint --nitpick? (it mentions "Warning: Unnecessary platforms line as darwin is the default" in the output, but I don't think that I should fix that here, as that seems off-topic, and it was already there)
  • tried existing tests with sudo port test? (it looks like I'll need to review the libepoxy active variants check, too...)
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?

@macportsbot
Copy link

Notifying maintainers:
@mascguy for port gtk3.

@macportsbot macportsbot added type: bugfix maintainer: open Affects an openmaintainer port labels Oct 3, 2024
@cooljeanius
Copy link
Contributor Author

oh wait, I forgot I'd have to do this for gtk3-devel, too; let me fix that...

@cooljeanius cooljeanius force-pushed the gtk3_active_variants_check branch from ea8b778 to f537081 Compare October 3, 2024 22:52
@cooljeanius
Copy link
Contributor Author

So I'm trying to see if I can remove the active_variants check on libepoxy, too, but now I'm running into 67675 again; aaaaah... the hack I discovered there of adding -Wl,-F/System/Library/Frameworks/ to configure.ldflags doesn't really seem appropriate for this PR...

@cooljeanius cooljeanius force-pushed the gtk3_active_variants_check branch from f537081 to d29a351 Compare October 16, 2024 21:23
@cooljeanius
Copy link
Contributor Author

So I'm trying to see if I can remove the active_variants check on libepoxy, too, but now I'm running into 67675 again; aaaaah... the hack I discovered there of adding -Wl,-F/System/Library/Frameworks/ to configure.ldflags doesn't really seem appropriate for this PR...

Could I get some feedback as to whether or not I should add that part here, too? It'd let me test properly, but also it's kind of a workaround...

@reneeotten
Copy link
Contributor

I am not seeing the purpose of this PR - why do you say that the active variant checks are incorrect here? It should either use x11 or quartz, that seems correct to me. Your not actually explaining what the problem is you're trying to solve here.

@cooljeanius
Copy link
Contributor Author

See discussion in the comments on d0aca00. Previously, I had glib2 installed with +x11 and gtk3 installed with +quartz perfectly fine. The added active variants check has been preventing me from upgrading all my gtk-based ports for several months now. This PR should allow me to be able to upgrade stuff again.

@mascguy
Copy link
Member

mascguy commented Nov 7, 2024

See discussion in the comments on d0aca00. Previously, I had glib2 installed with +x11 and gtk3 installed with +quartz perfectly fine. The added active variants check has been preventing me from upgrading all my gtk-based ports for several months now. This PR should allow me to be able to upgrade stuff again.

The active variant checks look correct as-is.

Can you refresh my memory... why do you want to keep glib2 +x11 installed, when you are otherwise using Quartz?

@cooljeanius
Copy link
Contributor Author

cooljeanius commented Nov 8, 2024 •
edited
Loading 

$ git grep "require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11"
devel/geoclue2/Portfile:    require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
devel/glibmm-2.4/Portfile:    require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
gnome/gtk3-devel/Portfile:    require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
gnome/gtk3/Portfile:    require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
python/py-gobject/Portfile:        require_active_variants path:lib/pkgconfig/glib-2.0.pc:glib2 x11
$ port installed geoclue2 glibmm-2.4 "gtk3*" "py*gobject*"
The following ports are currently installed:
  geoclue2 @2.4.13_0+demoagent+nmea+x11 (active)
  glibmm-2.4 @2.62.0_0+x11 (active)
  gtk3 @3.24.41_1+quartz (active)
  py-gobject @2.28.7_2 (active)
  py-gobject3 @3.46.0_0 (active)
  py27-gobject @2.28.7_2+x11 (active)
  py27-gobject3 @3.36.1_3 (active)
  py35-gobject @2.28.7_2+x11 (active)
  py36-gobject @2.28.7_2+x11 (active)
  py36-gobject3 @3.44.1_0 (active)
  py37-gobject @2.28.7_2+x11 (active)
  py37-gobject3 @3.44.1_0 (active)
  py38-gobject @2.28.7_2+x11 (active)
  py38-gobject3 @3.46.0_0 (active)
  py39-gobject @2.28.7_2+x11 (active)
  py39-gobject3 @3.46.0_0 (active)
  py310-gobject3 @3.46.0_0 (active)
  py311-gobject3 @3.46.0_0 (active)
  py312-gobject3 @3.46.0_0 (active)
$ port echo rdependentof:geoclue2 | xargs port installed | grep "+x11"
  glom @1.32.0_13+mysql57+postgresql11+x11 (active)
$ port echo rdependentof:glibmm-2.4 | xargs port installed | grep "+x11"
  glibmm @2.78.0_0+x11 (active)
  glom @1.32.0_13+mysql57+postgresql11+x11 (active)
  pangomm @2.52.0_0+quartz+x11 (active)
  pangomm-1.4 @2.42.1_0+quartz+x11 (active)

(so, to summarize, it's for geoclue2, glibmm-2.4, py*gobject, glom, glibmm, pangomm, and pangomm-1.4)

cooljeanius referenced this pull request Nov 21, 2024
@mohd-akram
gtk3: require active variant for glib2
d0aca00 
Resolves "Symbol not found: _g_desktop_app_info_get_filename"
cooljeanius referenced this pull request Nov 21, 2024
@FlyingSamson @neverpanic
gtk3: Require matching x11/quartz variant of libepoxy
a85cc86
cooljeanius referenced this pull request Nov 21, 2024
@neverpanic
glib2: Default to +quartz when -x11 is given
45c59fe 
When building pango -x11 in a clean prefix, glib2 will fail to install,
because the -x11 variant is being passed down to glib2, but glib2
requires either +quartz or +x11, and +quartz was not enabled by default
when x11 was disabled.

This caused problems when implementing variant support for the buildbot
in macports/mpbb#5 and initially caused me to
think that I would have to revert
  macports/mpbb@f6e4681
which was added due to macports/mpbb#4 and
https://lists.macports.org/pipermail/macports-dev/2017-June/035978.html.

This solution should instead work without the revert and still allow the
buildbot to build both wine and +quartz-x11 ports.

See: https://trac.macports.org/ticket/52742
@mascguy
Copy link
Member

mascguy commented Nov 29, 2024

Let's continue related discussion in the ticket

@mascguy mascguy closed this Nov 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mascguy mascguy

Labels
maintainer: open Affects an openmaintainer port type: bugfix
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cooljeanius @macportsbot @reneeotten @mascguy