Skip to content
Permalink
Browse files

glib2: Update to 2.58.1

  • Loading branch information
ryandesign committed Sep 29, 2018
1 parent 0c84bf3 commit 8cdc3fbdf2b8acb8dbd07e720783dfe83755190e
Showing with 43 additions and 33 deletions.
  1. +8 −8 devel/glib2/Portfile
  2. +35 −0 devel/glib2/files/POSIX-spawn.patch
  3. +0 −25 devel/glib2/files/which.patch
@@ -8,10 +8,10 @@ PortGroup compiler_blacklist_versions 1.0
name glib2
conflicts glib2-devel
set my_name glib
version 2.56.2
checksums rmd160 8fe9fd51a84ebe0f61b5cb2ab97325baa51c4eb3 \
sha256 d64abd16813501c956c4e123ae79f47f1b58de573df9fdd3b0795f1e2c1aa789 \
size 8041756
version 2.58.1
checksums rmd160 7951a41129225b9d38d7df72069f73560a9e86a0 \
sha256 97d6a9d926b6aa3dfaadad3077cfb43eec74432ab455dff14250c769d526d7d6 \
size 4906444

set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
@@ -40,8 +40,8 @@ patchfiles libintl.patch \
patch-get-launchd-dbus-session-address.diff \
patch-gmodule-gmodule-dl.c.diff \
patch-configure-switch-for-gappinfo-impl.diff \
universal.patch \
which.patch
POSIX-spawn.patch \
universal.patch

depends_build port:autoconf \
port:automake \
@@ -109,8 +109,8 @@ post-destroot {

set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog HACKING NEWS \
README ${destroot}${docdir}
xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README.md \
${destroot}${docdir}
}

platform darwin {
@@ -0,0 +1,35 @@
Fix build failure on systems without POSIX spawn (e.g. Tiger).
https://gitlab.gnome.org/GNOME/glib/merge_requests/345
--- configure.ac.orig 2018-09-28 22:48:05.000000000 -0500
+++ configure.ac 2018-09-28 22:57:08.000000000 -0500
@@ -638,6 +638,7 @@
AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
AC_CHECK_HEADERS([linux/magic.h])
AC_CHECK_HEADERS([termios.h])
+AC_CHECK_HEADERS([spawn.h])

# Some versions of MSC lack these
AC_CHECK_HEADERS([dirent.h sys/time.h])
--- glib/gspawn.c.orig 2018-09-24 00:50:28.000000000 -0500
+++ glib/gspawn.c 2018-09-24 01:29:42.000000000 -0500
@@ -30,7 +30,10 @@
#include <string.h>
#include <stdlib.h> /* for fdwalk */
#include <dirent.h>
+
+#ifdef HAVE_SPAWN_H
#include <spawn.h>
+#endif /* HAVE_SPAWN_H */

#ifdef HAVE_CRT_EXTERNS_H
#include <crt_externs.h> /* for _NSGetEnviron */
--- meson.build.orig 2018-09-21 09:23:53.000000000 -0500
+++ meson.build 2018-09-28 22:58:00.000000000 -0500
@@ -226,6 +226,7 @@
'poll.h',
'pwd.h',
'sched.h',
+ 'spawn.h',
'stdint.h',
'stdlib.h',
'string.h',

This file was deleted.

0 comments on commit 8cdc3fb

Please sign in to comment.
You can’t perform that action at this time.