CVS commit: pkgsrc/devel/glib2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 17 14:58:29 UTC 2018

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-an

Log Message:
glib2: try disabling the gio tests more.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/glib2/patches/patch-an

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.230 pkgsrc/devel/glib2/distinfo:1.231
--- pkgsrc/devel/glib2/distinfo:1.230   Tue Apr 17 08:03:38 2018
+++ pkgsrc/devel/glib2/distinfo Tue Apr 17 14:58:28 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.230 2018/04/17 08:03:38 wiz Exp $
+$NetBSD: distinfo,v 1.231 2018/04/17 14:58:28 wiz Exp $
 
 SHA1 (glib-2.56.1.tar.xz) = 4db098c15b9d57c37bb504a6f58ebe717994e6f2
 RMD160 (glib-2.56.1.tar.xz) = da4e45bf52d28b610a71bed8b4331bfb0b5c8d56
@@ -15,7 +15,7 @@ SHA1 (patch-aha) = ade66edd87a5e76a1256b
 SHA1 (patch-ak) = a7dd9b100b05424a76476754c2ee9896b5ae6d26
 SHA1 (patch-al) = af8428eeb6ce5e4dd70ddf972693df18d6c26d50
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = 85563d591ef224c53b432bd2101ac7a684451769
+SHA1 (patch-an) = 69edd1d40e3c8d9cc6744954e89e92c286bc6f58
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
 SHA1 (patch-cl) = f3b69b3b60290cde33e532dc5697dacd5537e7ce

Index: pkgsrc/devel/glib2/patches/patch-an
diff -u pkgsrc/devel/glib2/patches/patch-an:1.16 pkgsrc/devel/glib2/patches/patch-an:1.17
--- pkgsrc/devel/glib2/patches/patch-an:1.16    Tue Apr 17 08:03:38 2018
+++ pkgsrc/devel/glib2/patches/patch-an Tue Apr 17 14:58:29 2018
@@ -1,9 +1,7 @@
-$NetBSD: patch-an,v 1.16 2018/04/17 08:03:38 wiz Exp $
+$NetBSD: patch-an,v 1.17 2018/04/17 14:58:29 wiz Exp $
 
 - Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 - Don't compile tests as they include gdbus-codegen tests.
-- Don't install completion data.
-- Re-enable gdesktopappinfo on Darwin.
 
 --- gio/Makefile.in.orig       2018-04-07 02:37:14.000000000 +0000
 +++ gio/Makefile.in
@@ -16,12 +14,14 @@ $NetBSD: patch-an,v 1.16 2018/04/17 08:0
        fam
  am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
        $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
-@@ -1327,7 +1327,7 @@ all_test_ltlibs = $(test_ltlibraries) $(
+@@ -1327,8 +1327,8 @@ all_test_ltlibs = $(test_ltlibraries) $(
  @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
  
  @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
 -SUBDIRS = gdbus-2.0/codegen $(am__append_15) $(am__append_18) \
+-      $(am__append_21) $(am__append_24) . tests $(am__append_27)
 +SUBDIRS = $(am__append_15) $(am__append_18) \
-       $(am__append_21) $(am__append_24) . tests $(am__append_27)
++      $(am__append_21) $(am__append_24) . $(am__append_27)
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
+ AM_CPPFLAGS = \