+
Skip to content

Sync'ed dependencies in csproj/gir/Module.cs #875

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

Merged
merged 1 commit into from
Jun 23, 2023

Conversation

fogzot
Copy link
Contributor

@fogzot fogzot commented May 31, 2023

There are still some discrepancies between gir and csproj files, documented below. This changeset also normalize the format of csproj files moving metadata to the top and dependencies to the bottom.

Adw-1

  • gir does not include GObject

cairo-1.0

  • gir does not include GObject
  • gir does not include GLib

freetype2-2.0

  • gir does not include GObject
  • gir does not include GLib
  • Module.cs is missing

Gdk-4.0

  • gir does not include GObject

GdkPixbuf-2.0

  • gir does not include GObject
  • gir includes GModule (that cannot be included by csproj)

Gst-1.0

  • gir includes GModule (that cannot be included by csproj)

GstAudio-1.0

  • gir includes GModule (that cannot be included by csproj)

GstBase-1.0

  • gir includes GModule (that cannot be included by csproj)

GstPbutils-1.0

  • gir does not include GObject

GstVideo-1.0

  • gir does not include GObject

I agree that my contribution may be licensed either under MIT or any version of LGPL license.

Copy link
Member

@badcel badcel left a comment

Choose a reason for hiding this comment

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

Thank you! Very good work. There was some overhaul pretty necessary. Especially in Gtk.Module there was a lot of stuff which did not belong there.

In general I opted to remove explicit references to GObject if possible (in those cases it is referenced implicitly). Otherwise every module would need to reference GObject explicitly. I think this keeps the dependencies more in line with the gir files. Please see my comments.

Regarding freetype please remove it's GLib dependency. As it does not define a "shared-library" in the namespace tag, please don't add a Module.cs. There would be the code to sett the DLL-Library name, which is not possible due to the missing "shared-library" attribute.

@fogzot
Copy link
Contributor Author

fogzot commented Jun 14, 2023

I applied all changes, as requested.

@badcel badcel self-requested a review June 15, 2023 19:16
Copy link
Member

@badcel badcel left a comment

Choose a reason for hiding this comment

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

Thanks for updating your pr.

I think you missed my comment in regard to: src/Libs/GstPbutils-1.0/Public/Module.cs: GstPbUtils should not reference GObject directly and should not initialize it in the Module.cs.

Additionally I would like you to squash your commits into one and update the commit message of your first commit to match the current state. It should get a bit shorter after your last changes. Your second commit message should be obsolete then.

If those points are addressed I think it is good to go 🚀

There are still some discrepancies between gir and csproj files,
documented below. This changeset also normalize the format of csproj
files moving metadata to the top and dependencies to the bottom.

freetype2-2.0
- gir does not include GObject
- gir does not include GLib
- Module.cs is missing

GdkPixbuf-2.0
- gir includes GModule (that cannot be included by csproj)

Gst-1.0
- gir includes GModule (that cannot be included by csproj)

GstAudio-1.0
- gir includes GModule (that cannot be included by csproj)

GstBase-1.0
- gir includes GModule (that cannot be included by csproj)
Copy link
Member

@badcel badcel left a comment

Choose a reason for hiding this comment

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

Looks good to me 👍. Thanks for your contribution.

@badcel badcel merged commit a99db54 into gircore:main Jun 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载