Permalink
Browse files
glib2: Update to 2.56.0
Closes: https://trac.macports.org/ticket/56081 Also, patch configure.ac, not configure. The reason why we were patching configure was that patching configure.ac would have required running autoreconf, and that would have required pkg-config, and at the time, pkg-config depended on glib2, and MacPorts cannot accommodate circular dependencies. pkg-config has included its own private copy of glib2 since f0e3b8c, so this reason no longer applies. We have been maintaining a large configure patch which needs to be tediously regenerated from the configure.ac patch whenever glib2 is updated. That effort is saved by being able to use the configure.ac patch directly. The Portfile is also simplified by allowing pkg-config to find the libraries of the dependencies, rather than having to specify each of them manually. Reverts 847ba02. See: https://trac.macports.org/ticket/55577 Also, add SIZEOF_SSIZE_T handling to config.h.ed. This should have been done in 2eb6602 when similar patching was added to the configure script. Add a comment to the patch to remind the maintainer to update config.h.ed too. Also, no longer undefine AC_APPLE_UNIVERSAL_BUILD in config.h. It's unclear why we were ever doing this. config.h is only used at build time. The only thing AC_APPLE_UNIVERSAL_BUILD currently does is ensure WORDS_BIGENDIAN is defined correctly. glib doesn't use WORDS_BIGENDIAN; it uses its own G_BYTE_ORDER, G_BIG_ENDIAN and G_LITTLE_ENDIAN. Maybe AC_APPLE_UNIVERSAL_BUILD used to do something more objectionable.
- Loading branch information
Showing
with
173 additions
and 742 deletions.
- +19 −28 devel/glib2/Portfile
- +7 −3 devel/glib2/files/config.h.ed
- +18 −0 devel/glib2/files/gcocoanotificationbackend.patch
- +0 −602 devel/glib2/files/patch-configure-switch-for-gappinfo-impl-mp.diff
- +56 −48 devel/glib2/files/patch-configure-switch-for-gappinfo-impl.diff
- +4 −4 devel/glib2/files/patch-get-launchd-dbus-session-address.diff
- +2 −2 devel/glib2/files/patch-gio_gdbusprivate.c.diff
- +3 −3 devel/glib2/files/patch-gio_xdgmime_xdgmime.c.diff
- +3 −3 devel/glib2/files/patch-glib-gmain.c.diff
- +4 −4 devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
- +57 −45 devel/glib2/files/{patch-configure.diff → universal.patch}
| @@ -0,0 +1,18 @@ | ||
| Don't try to compile gcocoanotificationbackend.c on OS X < 10.9 which | ||
| doesn't support it. | ||
| https://bugzilla.gnome.org/show_bug.cgi?id=794380 | ||
| --- gio/Makefile.am.orig 2018-03-12 11:23:37.000000000 -0500 | ||
| +++ gio/Makefile.am 2018-03-15 14:27:31.000000000 -0500 | ||
| @@ -612,8 +612,11 @@ | ||
| gnextstepsettingsbackend.c \ | ||
| gosxcontenttype.c \ | ||
| gosxappinfo.c \ | ||
| - gosxappinfo.h \ | ||
| + gosxappinfo.h | ||
| +if MAC_OS_X_9 | ||
| +libgio_objc_2_0_la_SOURCES += \ | ||
| gcocoanotificationbackend.c | ||
| +endif | ||
|
|
||
| noinst_LTLIBRARIES += libgio-objc-2.0.la | ||
| libgio_2_0_la_LIBADD += libgio-objc-2.0.la |
Oops, something went wrong.