pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/glib2 Revert upstream change that introduces gos...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee5c15f1a662
branches:  trunk
changeset: 365185:ee5c15f1a662
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jul 11 11:52:42 2017 +0000

description:
Revert upstream change that introduces gosxcontenttype and removes
gdesktopappinfo on Darwin, it's clearly half-baked and breaks critical
packages such as GTK, as well as being completely incompatible with
pkgsrc as it assumes all apps will be shipped as bundles (.app)

Patches mostly taken from Homebrew.  Bump PKGREVISION.

diffstat:

 devel/glib2/Makefile                            |    9 +-
 devel/glib2/PLIST                               |    6 +-
 devel/glib2/distinfo                            |    7 +-
 devel/glib2/patches/patch-an                    |  119 +++++++++++++++++++++++-
 devel/glib2/patches/patch-gio_giomodule.c       |   37 +++++++
 devel/glib2/patches/patch-gio_glocalfileinfo.c  |   15 +++
 devel/glib2/patches/patch-gio_tests_Makefile.in |   48 +++++++++
 7 files changed, 228 insertions(+), 13 deletions(-)

diffs (truncated from 328 to 300 lines):

diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Tue Jul 11 11:40:24 2017 +0000
+++ b/devel/glib2/Makefile      Tue Jul 11 11:52:42 2017 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.234 2017/07/03 18:47:29 adam Exp $
+# $NetBSD: Makefile,v 1.235 2017/07/11 11:52:42 jperkin Exp $
 
 .include "Makefile.common"
 
+PKGREVISION=           1
 CATEGORIES=            devel gnome
 
 COMMENT=               Some useful routines for C programming (glib2)
@@ -54,12 +55,6 @@
 .  endif
 .endif
 
-PLIST_VARS+=   unix
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Darwin"
-PLIST.unix=    yes
-.endif
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/PLIST
--- a/devel/glib2/PLIST Tue Jul 11 11:40:24 2017 +0000
+++ b/devel/glib2/PLIST Tue Jul 11 11:52:42 2017 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.92 2017/07/03 18:47:29 adam Exp $
-${PLIST.unix}bin/gapplication
+@comment $NetBSD: PLIST,v 1.93 2017/07/11 11:52:42 jperkin Exp $
+bin/gapplication
 bin/gdbus
 bin/gio
 bin/gio-querymodules
@@ -13,7 +13,7 @@
 bin/gsettings
 bin/gtester
 bin/gtester-report
-${PLIST.unix}include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
+include/glib/gio-unix-2.0/gio/gdesktopappinfo.h
 include/glib/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/glib/gio-unix-2.0/gio/gunixconnection.h
 include/glib/gio-unix-2.0/gio/gunixcredentialsmessage.h
diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Tue Jul 11 11:40:24 2017 +0000
+++ b/devel/glib2/distinfo      Tue Jul 11 11:52:42 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.221 2017/07/03 17:42:45 prlw1 Exp $
+$NetBSD: distinfo,v 1.222 2017/07/11 11:52:42 jperkin Exp $
 
 SHA1 (glib-2.52.3.tar.xz) = 9e31cce788d018894e6e0b1350263bc11b41cff8
 RMD160 (glib-2.52.3.tar.xz) = 367e119f257be876718ce135d768705f9f8a56b6
@@ -14,7 +14,7 @@
 SHA1 (patch-ak) = edf116968bd3c787fea77787add7e0164b6f1ffb
 SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
-SHA1 (patch-an) = 64618bac5556cdcda5b33582618226366a8b43be
+SHA1 (patch-an) = a1308a37f60c4bbbe4e8bc43ea9ae4a50bc09ce4
 SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = f3d37cbb483863aab602f9c1209650e3e4795871
 SHA1 (patch-cd) = a8a90eca84a687400a92b0e26fafe4b9b6014ec3
@@ -22,8 +22,11 @@
 SHA1 (patch-cl) = 18f34d749a8ca5a996a1be0ebd3c8df9dc012839
 SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
 SHA1 (patch-gio_gdbusauthmechanismsha1.c) = 39b9e9375bc8832c2c177c8e89228790d9ae9e7b
+SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
+SHA1 (patch-gio_glocalfileinfo.c) = 57b38e4cfa3a3858b632c8387a9bdb3000b16655
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 18fc55be06dfa4ebf7128b8d1888aaff3b2b95c0
+SHA1 (patch-gio_tests_Makefile.in) = eaf244c54c0a5578149919c2dd939b993e618919
 SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
 SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
 SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/patches/patch-an
--- a/devel/glib2/patches/patch-an      Tue Jul 11 11:40:24 2017 +0000
+++ b/devel/glib2/patches/patch-an      Tue Jul 11 11:52:42 2017 +0000
@@ -1,11 +1,109 @@
-$NetBSD: patch-an,v 1.14 2017/07/03 17:42:45 prlw1 Exp $
+$NetBSD: patch-an,v 1.15 2017/07/11 11:52:42 jperkin 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       2017-06-22 13:16:23.000000000 +0000
 +++ gio/Makefile.in
+@@ -160,7 +160,7 @@ TESTS = $(am__EXEEXT_2)
+ @ENABLE_INSTALLED_TESTS_TRUE@ $(dist_installed_test_data)
+ @ENABLE_INSTALLED_TESTS_TRUE@am__append_13 = $(test_ltlibraries) $(installed_test_ltlibraries)
+ @ENABLE_INSTALLED_TESTS_TRUE@am__append_14 = $(installed_test_meta_DATA)
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_15 = xdgmime
++@OS_UNIX_TRUE@am__append_15 = xdgmime
+ @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@am__append_16 = gio-2.0.lib
+ @OS_WIN32_TRUE@am__append_17 = $(win32_settings_sources)
+ @OS_COCOA_TRUE@am__append_18 = $(cocoa_settings_sources)
+@@ -174,9 +174,9 @@ TESTS = $(am__EXEEXT_2)
+ @OS_WIN32_TRUE@am__append_26 = win32/libgiowin32.la
+ @OS_WIN32_TRUE@am__append_27 = win32/libgiowin32.la
+ @HAVE_FAM_TRUE@am__append_28 = fam
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_31 = gdesktopappinfo.h
++@OS_UNIX_TRUE@am__append_29 = xdgmime/libxdgmime.la
++@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
++@OS_UNIX_TRUE@am__append_31 = gdesktopappinfo.h
+ @MAC_OS_X_9_TRUE@@OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
+ @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@     gnetworkmonitornetlink.c \
+@@ -188,10 +188,10 @@ TESTS = $(am__EXEEXT_2)
+ @OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
+ @OS_WIN32_TRUE@am__append_35 = gcontenttype-win32.c
+ @OS_WIN32_TRUE@am__append_36 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
+-@OS_COCOA_TRUE@am__append_37 = gosxcontenttype.c
+-@OS_COCOA_TRUE@am__append_38 = gosxappinfo.c gosxappinfo.h
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_39 = gcontenttype.c
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_40 = gdesktopappinfo.c
++#@OS_COCOA_TRUE@am__append_37 = gosxcontenttype.c
++#@OS_COCOA_TRUE@am__append_38 = gosxappinfo.c gosxappinfo.h
++@OS_UNIX_TRUE@am__append_39 = gcontenttype.c
++@OS_UNIX_TRUE@am__append_40 = gdesktopappinfo.c
+ 
+ # This is dumb.  The ObjC source file should be properly named .m
+ @OS_COCOA_TRUE@am__append_41 = -xobjective-c
+@@ -208,7 +208,7 @@ bin_PROGRAMS = gio-querymodules$(EXEEXT)
+ 
+ # ------------------------------------------------------------------------
+ # gapplication(1) tool
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_49 = gapplication
++@OS_UNIX_TRUE@am__append_49 = gapplication
+ subdir = gio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
+@@ -525,13 +525,13 @@ am__objects_5 = libgio_2_0_la-gappinfo.l
+       libgio_2_0_la-gliststore.lo $(am__objects_2) $(am__objects_3) \
+       $(am__objects_4) $(am__objects_1)
+ @OS_WIN32_TRUE@am__objects_6 = libgio_2_0_la-gwin32appinfo.lo
+-@OS_COCOA_TRUE@am__objects_7 = libgio_2_0_la-gosxappinfo.lo
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_8 = libgio_2_0_la-gdesktopappinfo.lo
++#@OS_COCOA_TRUE@am__objects_7 = libgio_2_0_la-gosxappinfo.lo
++@OS_UNIX_TRUE@am__objects_8 = libgio_2_0_la-gdesktopappinfo.lo
+ am__objects_9 = $(am__objects_6) $(am__objects_7) $(am__objects_8)
+ @OS_WIN32_TRUE@am__objects_10 = libgio_2_0_la-gcontenttype-win32.lo
+-@OS_COCOA_TRUE@am__objects_11 = libgio_2_0_la-gosxcontenttype.lo
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__objects_12 =  \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        libgio_2_0_la-gcontenttype.lo
++#@OS_COCOA_TRUE@am__objects_11 = libgio_2_0_la-gosxcontenttype.lo
++@OS_UNIX_TRUE@am__objects_12 =  \
++@OS_UNIX_TRUE@        libgio_2_0_la-gcontenttype.lo
+ am__objects_13 = $(am__objects_10) $(am__objects_11) $(am__objects_12)
+ am__objects_14 = libgio_2_0_la-xdp-dbus.lo
+ am__objects_15 = libgio_2_0_la-gnetworkmonitorportal.lo \
+@@ -595,22 +595,22 @@ am__v_lt_1 = 
+ libgio_2_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgio_2_0_la_CFLAGS) \
+       $(CFLAGS) $(libgio_2_0_la_LDFLAGS) $(LDFLAGS) -o $@
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
++@OS_UNIX_TRUE@am__EXEEXT_1 = gapplication$(EXEEXT)
+ am__EXEEXT_2 =
+ @ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2)
+ @ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_2)
+ PROGRAMS = $(bin_PROGRAMS) $(installed_test_PROGRAMS) \
+       $(noinst_PROGRAMS)
+ am__gapplication_SOURCES_DIST = gapplication-tool.c
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am_gapplication_OBJECTS =  \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        gapplication-tool.$(OBJEXT)
++@OS_UNIX_TRUE@am_gapplication_OBJECTS =  \
++@OS_UNIX_TRUE@        gapplication-tool.$(OBJEXT)
+ gapplication_OBJECTS = $(am_gapplication_OBJECTS)
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_DEPENDENCIES =  \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        libgio-2.0.la \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(top_builddir)/gobject/libgobject-2.0.la \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(top_builddir)/gmodule/libgmodule-2.0.la \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(top_builddir)/glib/libglib-2.0.la \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(am__DEPENDENCIES_1)
++@OS_UNIX_TRUE@gapplication_DEPENDENCIES =  \
++@OS_UNIX_TRUE@        libgio-2.0.la \
++@OS_UNIX_TRUE@        $(top_builddir)/gobject/libgobject-2.0.la \
++@OS_UNIX_TRUE@        $(top_builddir)/gmodule/libgmodule-2.0.la \
++@OS_UNIX_TRUE@        $(top_builddir)/glib/libglib-2.0.la \
++@OS_UNIX_TRUE@        $(am__DEPENDENCIES_1)
+ am_gdbus_OBJECTS = gdbus-tool.$(OBJEXT)
+ gdbus_OBJECTS = $(am_gdbus_OBJECTS)
+ gdbus_DEPENDENCIES = libgio-2.0.la \
 @@ -931,8 +931,7 @@ am__set_b = \
      *) \
        b='$*';; \
@@ -27,6 +125,25 @@
  @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 = \
+@@ -1927,12 +1926,12 @@ gdbus_LDADD = libgio-2.0.la                            \
+       $(top_builddir)/glib/libglib-2.0.la             \
+       $(NULL)
+ 
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la                      \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(top_builddir)/gobject/libgobject-2.0.la       \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(top_builddir)/gmodule/libgmodule-2.0.la       \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(top_builddir)/glib/libglib-2.0.la             \
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@        $(NULL)
++@OS_UNIX_TRUE@gapplication_SOURCES = gapplication-tool.c
++@OS_UNIX_TRUE@gapplication_LDADD = libgio-2.0.la                      \
++@OS_UNIX_TRUE@        $(top_builddir)/gobject/libgobject-2.0.la       \
++@OS_UNIX_TRUE@        $(top_builddir)/gmodule/libgmodule-2.0.la       \
++@OS_UNIX_TRUE@        $(top_builddir)/glib/libglib-2.0.la             \
++@OS_UNIX_TRUE@        $(NULL)
+ 
+ completiondir = $(datadir)/bash-completion/completions
+ completion_DATA = \
 @@ -4800,7 +4799,7 @@ info: info-recursive
  
  info-am:
diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/patches/patch-gio_giomodule.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-gio_giomodule.c Tue Jul 11 11:52:42 2017 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-gio_giomodule.c,v 1.1 2017/07/11 11:52:42 jperkin Exp $
+
+Re-enable gdesktopappinfo on Darwin.
+
+--- gio/giomodule.c.orig       2017-06-22 12:52:49.000000000 +0000
++++ gio/giomodule.c
+@@ -43,12 +43,9 @@
+ #endif
+ #include <glib/gstdio.h>
+ 
+-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
++#if defined(G_OS_UNIX)
+ #include "gdesktopappinfo.h"
+ #endif
+-#ifdef HAVE_COCOA
+-#include "gosxappinfo.h"
+-#endif
+ 
+ #ifdef HAVE_COCOA
+ #include <AvailabilityMacros.h>
+@@ -978,7 +975,7 @@ _g_io_modules_ensure_extension_points_re
+     {
+       registered_extensions = TRUE;
+       
+-#if defined(G_OS_UNIX) && !defined(HAVE_COCOA)
++#if defined(G_OS_UNIX)
+ #if !GLIB_CHECK_VERSION (3, 0, 0)
+       ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
+       G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+@@ -1119,7 +1116,6 @@ _g_io_modules_ensure_loaded (void)
+ #endif
+ #ifdef HAVE_COCOA
+       g_type_ensure (g_nextstep_settings_backend_get_type ());
+-      g_type_ensure (g_osx_app_info_get_type ());
+ #endif
+ #ifdef G_OS_UNIX
+       g_type_ensure (_g_unix_volume_monitor_get_type ());
diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/patches/patch-gio_glocalfileinfo.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-gio_glocalfileinfo.c    Tue Jul 11 11:52:42 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-gio_glocalfileinfo.c,v 1.1 2017/07/11 11:52:42 jperkin Exp $
+
+Re-enable gdesktopappinfo on Darwin.
+
+--- gio/glocalfileinfo.c.orig  2017-06-22 12:52:49.000000000 +0000
++++ gio/glocalfileinfo.c
+@@ -1259,7 +1259,7 @@ get_content_type (const char          *b
+ 
+       content_type = g_content_type_guess (basename, NULL, 0, &result_uncertain);
+       
+-#if !defined(G_OS_WIN32) && !defined(HAVE_COCOA)
++#if !defined(G_OS_WIN32)
+       if (!fast && result_uncertain && path != NULL)
+       {
+         guchar sniff_buffer[4096];
diff -r 161ce8bb38d0 -r ee5c15f1a662 devel/glib2/patches/patch-gio_tests_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-gio_tests_Makefile.in   Tue Jul 11 11:52:42 2017 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-gio_tests_Makefile.in,v 1.1 2017/07/11 11:52:42 jperkin Exp $
+
+Re-enable gdesktopappinfo on Darwin.
+
+--- gio/tests/Makefile.in.orig 2017-06-22 13:16:24.000000000 +0000
++++ gio/tests/Makefile.in
+@@ -163,8 +163,8 @@ check_PROGRAMS = $(am__EXEEXT_22)
+ @OS_UNIX_TRUE@        gdbus-example-objectmanager-client \
+ @OS_UNIX_TRUE@        gdbus-example-objectmanager-server \
+ @OS_UNIX_TRUE@        gdbus-test-fixture
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_19 = apps
+-@OS_COCOA_FALSE@@OS_UNIX_TRUE@am__append_20 = mimeapps
++@OS_UNIX_TRUE@am__append_19 = apps
++@OS_UNIX_TRUE@am__append_20 = mimeapps
+ @OS_UNIX_TRUE@am__append_21 = gsettings gschema-compile
+ @OS_UNIX_FALSE@gsettings_DEPENDENCIES =  \
+ @OS_UNIX_FALSE@       $(top_builddir)/gio/libgio-2.0.la \
+@@ -332,7 +332,7 @@ am__EXEEXT_1 =
+ @OS_UNIX_TRUE@        live-g-file$(EXEEXT) socket-address$(EXEEXT) \
+ @OS_UNIX_TRUE@        stream-rw_all$(EXEEXT) unix-fd$(EXEEXT) \



Home | Main Index | Thread Index | Old Index