Skip to content
Permalink
Browse files

Re-fix installing gio/gdesktopappinfo.h on OS X, needed by at least

gtk{2,3} with the default x11 backend. Bump PKGREVISION.
  • Loading branch information...
schmonz committed Jun 28, 2019
1 parent 71bd822 commit 916958f10bf07f7d2f4f2a4ea74326798da98404
Showing with 17 additions and 8 deletions.
  1. +2 −2 devel/glib2/Makefile
  2. +2 −2 devel/glib2/PLIST
  3. +2 −2 devel/glib2/distinfo
  4. +11 −2 devel/glib2/patches/patch-gio_meson.build
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.256 2019/06/26 10:42:50 prlw1 Exp $
# $NetBSD: Makefile,v 1.257 2019/06/28 19:42:05 schmonz Exp $

.include "Makefile.common"

PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= devel gnome
COMMENT= Some useful routines for C programming (glib2)

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.104 2019/06/11 09:15:54 prlw1 Exp $
@comment $NetBSD: PLIST,v 1.105 2019/06/28 19:42:05 schmonz Exp $
${PLIST.nococoa}bin/gapplication
bin/gdbus
bin/gio
@@ -10,7 +10,7 @@ bin/glib-gettextize
bin/gobject-query
bin/gresource
bin/gsettings
${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixconnection.h
include/gio-unix-2.0/gio/gunixcredentialsmessage.h
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.252 2019/06/26 10:42:50 prlw1 Exp $
$NetBSD: distinfo,v 1.253 2019/06/28 19:42:05 schmonz Exp $

SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
@@ -11,7 +11,7 @@ SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
SHA1 (patch-gio_meson.build) = a0dcda4e9d05ed83b7fb11102945821eea27b81d
SHA1 (patch-gio_meson.build) = 56b86a0b8ade34ebd155b2d530a19bf3eac97b76
SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8
SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1
@@ -1,11 +1,20 @@
$NetBSD: patch-gio_meson.build,v 1.4 2019/06/16 15:28:12 leot Exp $
$NetBSD: patch-gio_meson.build,v 1.5 2019/06/28 19:42:05 schmonz Exp $

Don't build tests, as have strong dependency on libdl.
Disable inotify on SunOS.
Install gio/gdesktopappinfo.h on OS X.

--- gio/meson.build.orig 2019-06-10 17:47:20.000000000 +0000
+++ gio/meson.build
@@ -758,7 +758,7 @@ gioenumtypes_c = custom_target('gioenumt
@@ -421,6 +421,7 @@ if host_system != 'windows'
unix_sources += files('gcocoanotificationbackend.m')
endif
application_headers += files('gosxappinfo.h')
+ gio_unix_include_headers += files('gdesktopappinfo.h')
else
contenttype_sources += files('gcontenttype.c')
appinfo_sources += files('gdesktopappinfo.c')
@@ -758,7 +759,7 @@ gioenumtypes_c = custom_target('gioenumt
gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h])

# inotify

0 comments on commit 916958f

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