source: trunk/dports/devel/glib2/files/remove-gcocoanotificationbackend.patch @ 142222

Last change on this file since 142222 was 142222, checked in by ryandesign@…, 4 years ago

glib2: update to 2.46.2

File size: 14.0 KB
  • configure

    Remove GNotification support added in https://bugzilla.gnome.org/show_bug.cgi?id=747146
    Reverts:
    https://git.gnome.org/browse/glib/commit/?id=89058e8a9b769ab223bc75739f5455dab18f7a3d
    And most of:
    https://git.gnome.org/browse/glib/commit/?id=36e093a31a9eb12021e7780b9e322c29763ffa58
    old new  
    60326032  COCOA_LIBS="-Wl,-framework,Foundation"
    60336033  LDFLAGS="$LDFLAGS $COCOA_LIBS"
    60346034
    6035   osx_version=`sw_vers -productVersion`
    6036   osx_min_version="10.9.0"
    6037   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OSX version >= $osx_min_version" >&5
    6038 $as_echo_n "checking OSX version >= $osx_min_version... " >&6; }
    6039   as_arg_v1=$osx_version
    6040 as_arg_v2=$osx_min_version
    6041 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
    6042 case $? in #(
    6043   1) :
    6044 
    6045     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    6046 $as_echo "no" >&6; }
    6047     as_fn_error $? "OSX version is too old!" "$LINENO" 5
    6048    ;; #(
    6049   0) :
    6050      ;; #(
    6051   2) :
    6052      ;; #(
    6053   *) :
    6054      ;;
    6055 esac
    6056   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    6057 $as_echo "yes" >&6; }
    6058 
    60596035else
    60606036  COCOA_LIBS=""
    60616037fi
  • gio/Makefile.in

    old new  
    177177@OS_UNIX_TRUE@am__append_29 = gdesktopappinfo.c
    178178@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
    179179@OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
    180 @OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
    181 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
     180@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_32 = \
    182181@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornetlink.c \
    183182@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornetlink.h \
    184183@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornm.c      \
    185184@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornm.h      \
    186185@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       $(NULL)
    187186
    188 @OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
    189 @OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
     187@OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
     188@OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
    190189
    191190# This is dumb.  The ObjC source file should be properly named .m
    192 @OS_COCOA_TRUE@am__append_36 = -xobjective-c
    193 @OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
     191@OS_COCOA_TRUE@am__append_35 = -xobjective-c
     192@OS_COCOA_TRUE@am__append_36 = -Wl,-framework,Foundation
    194193bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
    195194        glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
    196195        gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT)
    197196
    198197# ------------------------------------------------------------------------
    199198# gapplication(1) tool
    200 @OS_UNIX_TRUE@am__append_38 = gapplication
     199@OS_UNIX_TRUE@am__append_37 = gapplication
    201200subdir = gio
    202201ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    203202am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
     
    313312        gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
    314313        gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
    315314        gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
    316         ggtknotificationbackend.c gcocoanotificationbackend.c \
    317         gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
    318         gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
    319         gdbusdaemon.h gdbus-daemon-generated.c \
    320         gdbus-daemon-generated.h gwin32registrykey.c \
    321         gwin32registrykey.h gcontenttype-win32.c gwin32mount.c \
    322         gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
    323         gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
    324         gwin32networking.h gapplication.c gapplicationcommandline.c \
    325         gapplicationimpl-dbus.c gapplicationimpl.h gactiongroup.c \
    326         gactionmap.c gsimpleactiongroup.c gremoteactiongroup.c \
     315        ggtknotificationbackend.c gnetworkmonitornetlink.c \
     316        gnetworkmonitornetlink.h gnetworkmonitornm.c \
     317        gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
     318        gdbus-daemon-generated.c gdbus-daemon-generated.h \
     319        gwin32registrykey.c gwin32registrykey.h gcontenttype-win32.c \
     320        gwin32mount.c gwin32mount.h gwin32volumemonitor.c \
     321        gwin32volumemonitor.h gwin32inputstream.c gwin32outputstream.c \
     322        gwin32outputstream.h gwin32networking.h gapplication.c \
     323        gapplicationcommandline.c gapplicationimpl-dbus.c \
     324        gapplicationimpl.h gactiongroup.c gactionmap.c \
     325        gsimpleactiongroup.c gremoteactiongroup.c \
    327326        gactiongroupexporter.c gdbusactiongroup-private.h \
    328327        gdbusactiongroup.c gaction.c gpropertyaction.c gsimpleaction.c \
    329328        gmenumodel.c gmenu.c gmenuexporter.c gdbusmenumodel.c \
     
    369368@OS_WIN32_TRUE@am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
    370369am__objects_3 = $(am__objects_1) $(am__objects_2)
    371370am__objects_4 =
    372 @OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
    373 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
     371@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gnetworkmonitornetlink.lo \
    374372@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       libgio_2_0_la-gnetworkmonitornm.lo \
    375373@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       $(am__objects_4)
    376 @OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
     374@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gfiledescriptorbased.lo \
    377375@OS_UNIX_TRUE@  libgio_2_0_la-gunixconnection.lo \
    378376@OS_UNIX_TRUE@  libgio_2_0_la-gunixcredentialsmessage.lo \
    379377@OS_UNIX_TRUE@  libgio_2_0_la-gunixfdlist.lo \
     
    388386@OS_UNIX_TRUE@  libgio_2_0_la-gcontenttype.lo \
    389387@OS_UNIX_TRUE@  libgio_2_0_la-gfdonotificationbackend.lo \
    390388@OS_UNIX_TRUE@  libgio_2_0_la-ggtknotificationbackend.lo \
    391 @OS_UNIX_TRUE@  $(am__objects_4) $(am__objects_5) \
    392 @OS_UNIX_TRUE@  $(am__objects_6)
    393 am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
     389@OS_UNIX_TRUE@  $(am__objects_4) $(am__objects_5)
     390am__objects_7 = libgio_2_0_la-gdbusdaemon.lo \
    394391        libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_4)
    395 am__objects_9 = $(am__objects_8) libgio_2_0_la-gwin32registrykey.lo \
     392am__objects_8 = $(am__objects_7) libgio_2_0_la-gwin32registrykey.lo \
    396393        libgio_2_0_la-gcontenttype-win32.lo \
    397394        libgio_2_0_la-gwin32mount.lo \
    398395        libgio_2_0_la-gwin32volumemonitor.lo \
    399396        libgio_2_0_la-gwin32inputstream.lo \
    400397        libgio_2_0_la-gwin32outputstream.lo $(am__objects_4)
    401 @OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
    402 am__objects_11 = libgio_2_0_la-gapplication.lo \
     398@OS_WIN32_TRUE@am__objects_9 = $(am__objects_8)
     399am__objects_10 = libgio_2_0_la-gapplication.lo \
    403400        libgio_2_0_la-gapplicationcommandline.lo \
    404401        libgio_2_0_la-gapplicationimpl-dbus.lo \
    405402        libgio_2_0_la-gactiongroup.lo libgio_2_0_la-gactionmap.lo \
     
    412409        libgio_2_0_la-gmenu.lo libgio_2_0_la-gmenuexporter.lo \
    413410        libgio_2_0_la-gdbusmenumodel.lo libgio_2_0_la-gnotification.lo \
    414411        libgio_2_0_la-gnotificationbackend.lo $(am__objects_4)
    415 @OS_WIN32_TRUE@am__objects_12 =  \
     412@OS_WIN32_TRUE@am__objects_11 =  \
    416413@OS_WIN32_TRUE@ libgio_2_0_la-gregistrysettingsbackend.lo
    417 @OS_COCOA_TRUE@am__objects_13 =  \
     414@OS_COCOA_TRUE@am__objects_12 =  \
    418415@OS_COCOA_TRUE@ libgio_2_0_la-gnextstepsettingsbackend.lo
    419 am__objects_14 = libgio_2_0_la-gvdb-reader.lo \
     416am__objects_13 = libgio_2_0_la-gvdb-reader.lo \
    420417        libgio_2_0_la-gdelayedsettingsbackend.lo \
    421418        libgio_2_0_la-gkeyfilesettingsbackend.lo \
    422419        libgio_2_0_la-gmemorysettingsbackend.lo \
     
    424421        libgio_2_0_la-gsettingsbackend.lo \
    425422        libgio_2_0_la-gsettingsschema.lo \
    426423        libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo \
    427         $(am__objects_12) $(am__objects_13)
    428 am__objects_15 = libgio_2_0_la-gdbusutils.lo \
     424        $(am__objects_11) $(am__objects_12)
     425am__objects_14 = libgio_2_0_la-gdbusutils.lo \
    429426        libgio_2_0_la-gdbusaddress.lo \
    430427        libgio_2_0_la-gdbusauthobserver.lo libgio_2_0_la-gdbusauth.lo \
    431428        libgio_2_0_la-gdbusauthmechanism.lo \
     
    447444        libgio_2_0_la-gdbusobjectmanagerclient.lo \
    448445        libgio_2_0_la-gdbusobjectmanagerserver.lo \
    449446        libgio_2_0_la-gtestdbus.lo $(am__objects_4)
    450 am__objects_16 = libgio_2_0_la-ghttpproxy.lo \
     447am__objects_15 = libgio_2_0_la-ghttpproxy.lo \
    451448        libgio_2_0_la-glocalfile.lo \
    452449        libgio_2_0_la-glocalfileenumerator.lo \
    453450        libgio_2_0_la-glocalfileinfo.lo \
     
    541538        libgio_2_0_la-gzlibcompressor.lo \
    542539        libgio_2_0_la-gzlibdecompressor.lo \
    543540        libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
    544         libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_7) \
    545         $(am__objects_10) $(am__objects_11) $(am__objects_14) \
    546         $(am__objects_15) $(am__objects_16) $(am__objects_4)
     541        libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_6) \
     542        $(am__objects_9) $(am__objects_10) $(am__objects_13) \
     543        $(am__objects_14) $(am__objects_15) $(am__objects_4)
    547544libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
    548545AM_V_lt = $(am__v_lt_@AM_V@)
    549546am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     
    14111408        $(NULL)
    14121409
    14131410platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
    1414         $(am__append_30) $(am__append_35)
     1411        $(am__append_30) $(am__append_34)
    14151412platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
    14161413        $(am__append_31)
    1417 appinfo_sources = $(am__append_29) $(am__append_34)
     1414appinfo_sources = $(am__append_29) $(am__append_33)
    14181415@OS_UNIX_TRUE@unix_sources = gfiledescriptorbased.c gunixconnection.c \
    14191416@OS_UNIX_TRUE@  gunixcredentialsmessage.c gunixfdlist.c \
    14201417@OS_UNIX_TRUE@  gunixfdmessage.c gunixmount.c gunixmount.h \
     
    14241421@OS_UNIX_TRUE@  gunixoutputstream.c gcontenttype.c \
    14251422@OS_UNIX_TRUE@  gcontenttypeprivate.h gfdonotificationbackend.c \
    14261423@OS_UNIX_TRUE@  ggtknotificationbackend.c $(NULL) \
    1427 @OS_UNIX_TRUE@  $(am__append_32) $(am__append_33)
     1424@OS_UNIX_TRUE@  $(am__append_32)
    14281425@OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
    14291426@OS_UNIX_TRUE@giounixinclude_HEADERS = \
    14301427@OS_UNIX_TRUE@  gdesktopappinfo.h       \
     
    16451642@OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
    16461643@OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res_ldflag = -Wl,$(gio_win32_res)
    16471644libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
    1648         $(am__append_36)
     1645        $(am__append_35)
    16491646libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
    16501647        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
    1651         -export-dynamic $(no_undefined) $(am__append_37)
     1648        -export-dynamic $(no_undefined) $(am__append_36)
    16521649libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
    16531650gio_headers = \
    16541651        gappinfo.h              \
     
    22012198@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo@am__quote@
    22022199@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo@am__quote@
    22032200@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo@am__quote@
    2204 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo@am__quote@
    22052201@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo@am__quote@
    22062202@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo@am__quote@
    22072203@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo@am__quote@
     
    33193315@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    33203316@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-ggtknotificationbackend.lo `test -f 'ggtknotificationbackend.c' || echo '$(srcdir)/'`ggtknotificationbackend.c
    33213317
    3322 libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
    3323 @am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gcocoanotificationbackend.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
    3324 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
    3325 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
    3326 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    3327 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -c -o libgio_2_0_la-gcocoanotificationbackend.lo `test -f 'gcocoanotificationbackend.c' || echo '$(srcdir)/'`gcocoanotificationbackend.c
    3328 
    33293318libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
    33303319@am__fastdepCC_TRUE@    $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgio_2_0_la_CPPFLAGS) $(CPPFLAGS) $(libgio_2_0_la_CFLAGS) $(CFLAGS) -MT libgio_2_0_la-gnetworkmonitornetlink.lo -MD -MP -MF $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo -c -o libgio_2_0_la-gnetworkmonitornetlink.lo `test -f 'gnetworkmonitornetlink.c' || echo '$(srcdir)/'`gnetworkmonitornetlink.c
    33313320@am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Tpo $(DEPDIR)/libgio_2_0_la-gnetworkmonitornetlink.Plo
  • gio/giomodule.c

    old new  
    911911extern GType g_gtk_notification_backend_get_type (void);
    912912#endif
    913913
    914 #ifdef HAVE_COCOA
    915 extern GType g_cocoa_notification_backend_get_type (void);
    916 #endif
    917 
    918914#ifdef G_PLATFORM_WIN32
    919915
    920916#include <windows.h>
     
    10881084      g_type_ensure (g_fdo_notification_backend_get_type ());
    10891085      g_type_ensure (g_gtk_notification_backend_get_type ());
    10901086#endif
    1091 #ifdef HAVE_COCOA
    1092       g_type_ensure (g_cocoa_notification_backend_get_type ());
    1093 #endif
    10941087#ifdef G_OS_WIN32
    10951088      g_type_ensure (_g_winhttp_vfs_get_type ());
    10961089#endif
Note: See TracBrowser for help on using the repository browser.