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

Adapted glib2 to have the gio-launch-desktop back build on the generic (x11) version. #23866

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

christophecvr
Copy link
Contributor

For applications such as nautilus who require x11 the
gio-launch-desktop bin is a requirement for some functions.
By adding the patch for build quartz(native) or x11(generic)
This add was forgotten for build of x11.
With this modified patch it is back in.

the last part of patch :
devel/glib2/files/patch-meson_build-meson_options-appinfo.diff

has been modified and in section generic build this part below is added

      launch_desktop_sources = files('gio-launch-desktop.c')
      gio_launch_desktop = executable('gio-launch-desktop', launch_desktop_sources,
        include_directories : glibinc,
        install : true,
        install_dir : multiarch_libexecdir,
        install_tag : 'bin',
        c_args : gio_c_args,
        # intl.lib is not compatible with SAFESEH
        link_args : noseh_link_args)

I also included a port bump revision from 0 to 1 . Tested by me by building without -s option and yes it builded from source like it must whit a revison bump.

…neric (x11)

 By patching the glib2 lib to work for quartz or x11,
 The add off gio-launch-desktop binary to libexec was forgotten.
 The patch self is now adapted to build this binary for the x11
 (generic backend) version only. This binary is needed for some
 functions in gnome x11 applications such as nautilus .

 On branch master
 Changes to be committed:
	modified:   devel/glib2/Portfile
	modified:   devel/glib2/files/patch-meson_build-meson_options-appinfo.diff
@macportsbot
Copy link

Notifying maintainers:
@mascguy for port glib2.

@macportsbot macportsbot added the maintainer: open Affects an openmaintainer port label May 8, 2024
@christophecvr
Copy link
Contributor Author

@mascguy Is there something wrong with this patch ? The gio-launch-desktop is really required for nautilus and .. only for x11 (generic). Does build perfect without any extra change on glib2 port. And will only build with x11 (generic) glib2 version.

@mascguy
Copy link
Member

mascguy commented May 17, 2024

@mascguy Is there something wrong with this patch ? The gio-launch-desktop is really required for nautilus and .. only for x11 (generic). Does build perfect without any extra change on glib2 port. And will only build with x11 (generic) glib2 version.

I have been away from my Mac for the past week, and am not able to test with this change. So I cannot say for sure at this point.

We should really have someone knowledgeable test and verify this, as glib2 is a foundational port. And if it breaks, we will be flooded with tickets.

Can you change this PR to update port glib2-devel instead? That will allow a small number of us to test it, before releasing to everyone.

@christophecvr
Copy link
Contributor Author

Hallo, Yes I will then first build the glib2-devel by me to see if it's ok.

@christophecvr
Copy link
Contributor Author

ok I just also added pull request for glib2-devel.

@mascguy
Copy link
Member

mascguy commented May 19, 2024

ok I just also added pull request for glib2-devel.

Thank you. I'm changing this PR to draft for now, so that it isn't accidentally merged yet.

@mascguy mascguy marked this pull request as draft May 19, 2024 16:24
@christophecvr
Copy link
Contributor Author

Just for info . This patch does not change anything to base build of glib2 . It is just the required gio-launch-desktop binary wich was forgotten when the appinfo meson.build patch was made to have the generic (x11) or native (quartz) build . This binary is required to launch applications from nautilus browser which is a gnome-core app requires gnome- desktop and x11 . It normally won’t break anything nor create a conflict with anything. On quartz (native) glib2 it is not build .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintainer: open Affects an openmaintainer port
3 participants