Skip to content

Updating xdgmime

Emmanuel Fleury requested to merge emmanuel.fleury/glib:xdgmime_update into main

Updating the xdgmime code with the last code available in the xdgmime project (see #2349).

I have identified all the glib commits that involve xdgmime with git log --grep=xdgmime --oneline, here follows the list of reapplied commits and discarded commits.

Reapplied

  • b86e46e8 xdgmime: Finer handling for cases where mmap() is not available
  • adf96047 xdgmime: Prevent infinite loops from badly-formed MIME registrations
  • b6f7f374 xdgmime: Add xdg_mime_set_dirs() method to override XDG envvars
  • 90afd3b7 gio/xdgmime/: LGPLv2+ -> LGPLv2.1+
  • 14e0ad7c Don't compile some unused functions in gio/xdgmime/

Already applied or Not concerning directly xdgmime project

  • 07ad3555 Partically revert the last commit after realizing that
  • 101521f6 Avoid possible memory corruption in xdgmime, fd.o bug 12512, reported by
  • 1c177ce0 xdgmime: Add better detection for text vs. binary and zero-sized files
  • 4a0cb8f3 xdgmime: Don’t set an out argument if it’s NULL
  • 2e3769a4 Meson: Fix cocoa and carbon support
  • e55efa35 OSX: Use xdgmime system to guess content type from data
  • 3bf4a720 gio/: LGPLv2+ -> LGPLv2.1+
  • eb7b796b xdgmime: fix special case for mime_type_subclass
  • be7f4018 xdgmime: Fix an invalid read
  • 346aa683 Fix visibility for glib/ and gio/ submodules
  • d68609f9 Revert "xdgmime: plug a small leak"
  • 4e7031f0 xdgmime: plug a small leak
  • 2542b6f6 xdgmime: Handle EINTR in open()
  • 2a371087 xdgmime: sort glob hits with larger weight first
  • 07ad638a remove xdgmime test
  • c7c0bcef xdgmime - Correct the range checks for magic matching
  • e1643fd7 xdgmime - support the new case sensitive flag
  • 7c27df1f xdgmime - support cache files with minor version 2
  • 92ac8d16 Misc warning fixes
  • f8cfff06 Don't assume filenames are UTF-8.
  • 7943f976 cast a "char **" to "const char **" to avoid a warning.
  • a8c88cae Bug 555711 – Wrong fallback order of mimetype icons
  • 80e11e1d Bug 551149 – xdgmime mem leak
  • f5edeb8c Bug 546079 – leak in xdgmime
  • 9fd295d2 Rework the timestamp checking code to protect against duplicate
  • 5241d96b Fix sparse warnings (#519489)
  • e064f284 Use list_parents, not get_parents from xdgmime, because the later doesn't
  • 7f328023 Added. Added. Added. Added.

Helps: #2349

Edited by Philip Withnall

Merge request reports