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

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

glib2: update to 2.48.0

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  
    60295969  COCOA_LIBS="-Wl,-framework,Foundation"
    60305970  LDFLAGS="$LDFLAGS $COCOA_LIBS"
    60315971
    6032   osx_version=`sw_vers -productVersion`
    6033   osx_min_version="10.9.0"
    6034   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OSX version >= $osx_min_version" >&5
    6035 $as_echo_n "checking OSX version >= $osx_min_version... " >&6; }
    6036   as_arg_v1=$osx_version
    6037 as_arg_v2=$osx_min_version
    6038 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
    6039 case $? in #(
    6040   1) :
    6041 
    6042     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    6043 $as_echo "no" >&6; }
    6044     as_fn_error $? "OSX version is too old!" "$LINENO" 5
    6045    ;; #(
    6046   0) :
    6047      ;; #(
    6048   2) :
    6049      ;; #(
    6050   *) :
    6051      ;;
    6052 esac
    6053   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    6054 $as_echo "yes" >&6; }
    6055 
    60565972else
    60575973  COCOA_LIBS=""
    60585974fi
  • gio/Makefile.in

    old new  
    181181@OS_UNIX_TRUE@am__append_29 = gdesktopappinfo.c
    182182@OS_UNIX_TRUE@am__append_30 = xdgmime/libxdgmime.la
    183183@OS_UNIX_TRUE@am__append_31 = xdgmime/libxdgmime.la
    184 @OS_COCOA_TRUE@@OS_UNIX_TRUE@am__append_32 = gcocoanotificationbackend.c
    185 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_33 = \
     184@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__append_32 = \
    186185@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornetlink.c \
    187186@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornetlink.h \
    188187@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornm.c      \
    189188@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       gnetworkmonitornm.h      \
    190189@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       $(NULL)
    191190
    192 @OS_WIN32_TRUE@am__append_34 = gwin32appinfo.c gwin32appinfo.h
    193 @OS_WIN32_TRUE@am__append_35 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
     191@OS_WIN32_TRUE@am__append_33 = gwin32appinfo.c gwin32appinfo.h
     192@OS_WIN32_TRUE@am__append_34 = -lshlwapi -lws2_32 -ldnsapi -liphlpapi
    194193
    195194# This is dumb.  The ObjC source file should be properly named .m
    196 @OS_COCOA_TRUE@am__append_36 = -xobjective-c
    197 @OS_COCOA_TRUE@am__append_37 = -Wl,-framework,Foundation -Wl,-framework,AppKit
     195@OS_COCOA_TRUE@am__append_35 = -xobjective-c
     196@OS_COCOA_TRUE@am__append_36 = -Wl,-framework,Foundation
    198197bin_PROGRAMS = gio-querymodules$(EXEEXT) glib-compile-schemas$(EXEEXT) \
    199198        glib-compile-resources$(EXEEXT) gsettings$(EXEEXT) \
    200199        gdbus$(EXEEXT) $(am__EXEEXT_1) gresource$(EXEEXT)
    201200
    202201# ------------------------------------------------------------------------
    203202# gapplication(1) tool
    204 @OS_UNIX_TRUE@am__append_38 = gapplication
     203@OS_UNIX_TRUE@am__append_37 = gapplication
    205204subdir = gio
    206205ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    207206am__aclocal_m4_deps = $(top_srcdir)/m4macros/attributes.m4 \
     
    317316        gunixvolume.c gunixvolume.h gunixvolumemonitor.c \
    318317        gunixvolumemonitor.h gunixinputstream.c gunixoutputstream.c \
    319318        gcontenttype.c gcontenttypeprivate.h gfdonotificationbackend.c \
    320         ggtknotificationbackend.c gcocoanotificationbackend.c \
    321         gnetworkmonitornetlink.c gnetworkmonitornetlink.h \
    322         gnetworkmonitornm.c gnetworkmonitornm.h gdbusdaemon.c \
    323         gdbusdaemon.h gdbus-daemon-generated.c \
    324         gdbus-daemon-generated.h gwin32registrykey.c \
    325         gwin32registrykey.h gcontenttype-win32.c gwin32mount.c \
    326         gwin32mount.h gwin32volumemonitor.c gwin32volumemonitor.h \
    327         gwin32inputstream.c gwin32outputstream.c gwin32outputstream.h \
    328         gwin32networking.h gapplication.c gapplicationcommandline.c \
    329         gapplicationimpl-dbus.c gapplicationimpl.h gactiongroup.c \
    330         gactionmap.c gsimpleactiongroup.c gremoteactiongroup.c \
     319        ggtknotificationbackend.c gnetworkmonitornetlink.c \
     320        gnetworkmonitornetlink.h gnetworkmonitornm.c \
     321        gnetworkmonitornm.h gdbusdaemon.c gdbusdaemon.h \
     322        gdbus-daemon-generated.c gdbus-daemon-generated.h \
     323        gwin32registrykey.c gwin32registrykey.h gcontenttype-win32.c \
     324        gwin32mount.c gwin32mount.h gwin32volumemonitor.c \
     325        gwin32volumemonitor.h gwin32inputstream.c gwin32outputstream.c \
     326        gwin32outputstream.h gwin32networking.h gapplication.c \
     327        gapplicationcommandline.c gapplicationimpl-dbus.c \
     328        gapplicationimpl.h gactiongroup.c gactionmap.c \
     329        gsimpleactiongroup.c gremoteactiongroup.c \
    331330        gactiongroupexporter.c gdbusactiongroup-private.h \
    332331        gdbusactiongroup.c gaction.c gpropertyaction.c gsimpleaction.c \
    333332        gmenumodel.c gmenu.c gmenuexporter.c gdbusmenumodel.c \
     
    373372@OS_WIN32_TRUE@am__objects_2 = libgio_2_0_la-gwin32appinfo.lo
    374373am__objects_3 = $(am__objects_1) $(am__objects_2)
    375374am__objects_4 =
    376 @OS_COCOA_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gcocoanotificationbackend.lo
    377 @HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gnetworkmonitornetlink.lo \
     375@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@am__objects_5 = libgio_2_0_la-gnetworkmonitornetlink.lo \
    378376@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       libgio_2_0_la-gnetworkmonitornm.lo \
    379377@HAVE_NETLINK_TRUE@@OS_UNIX_TRUE@       $(am__objects_4)
    380 @OS_UNIX_TRUE@am__objects_7 = libgio_2_0_la-gfiledescriptorbased.lo \
     378@OS_UNIX_TRUE@am__objects_6 = libgio_2_0_la-gfiledescriptorbased.lo \
    381379@OS_UNIX_TRUE@  libgio_2_0_la-gunixconnection.lo \
    382380@OS_UNIX_TRUE@  libgio_2_0_la-gunixcredentialsmessage.lo \
    383381@OS_UNIX_TRUE@  libgio_2_0_la-gunixfdlist.lo \
     
    392390@OS_UNIX_TRUE@  libgio_2_0_la-gcontenttype.lo \
    393391@OS_UNIX_TRUE@  libgio_2_0_la-gfdonotificationbackend.lo \
    394392@OS_UNIX_TRUE@  libgio_2_0_la-ggtknotificationbackend.lo \
    395 @OS_UNIX_TRUE@  $(am__objects_4) $(am__objects_5) \
    396 @OS_UNIX_TRUE@  $(am__objects_6)
    397 am__objects_8 = libgio_2_0_la-gdbusdaemon.lo \
     393@OS_UNIX_TRUE@  $(am__objects_4) $(am__objects_5)
     394am__objects_7 = libgio_2_0_la-gdbusdaemon.lo \
    398395        libgio_2_0_la-gdbus-daemon-generated.lo $(am__objects_4)
    399 am__objects_9 = $(am__objects_8) libgio_2_0_la-gwin32registrykey.lo \
     396am__objects_8 = $(am__objects_7) libgio_2_0_la-gwin32registrykey.lo \
    400397        libgio_2_0_la-gcontenttype-win32.lo \
    401398        libgio_2_0_la-gwin32mount.lo \
    402399        libgio_2_0_la-gwin32volumemonitor.lo \
    403400        libgio_2_0_la-gwin32inputstream.lo \
    404401        libgio_2_0_la-gwin32outputstream.lo $(am__objects_4)
    405 @OS_WIN32_TRUE@am__objects_10 = $(am__objects_9)
    406 am__objects_11 = libgio_2_0_la-gapplication.lo \
     402@OS_WIN32_TRUE@am__objects_9 = $(am__objects_8)
     403am__objects_10 = libgio_2_0_la-gapplication.lo \
    407404        libgio_2_0_la-gapplicationcommandline.lo \
    408405        libgio_2_0_la-gapplicationimpl-dbus.lo \
    409406        libgio_2_0_la-gactiongroup.lo libgio_2_0_la-gactionmap.lo \
     
    416413        libgio_2_0_la-gmenu.lo libgio_2_0_la-gmenuexporter.lo \
    417414        libgio_2_0_la-gdbusmenumodel.lo libgio_2_0_la-gnotification.lo \
    418415        libgio_2_0_la-gnotificationbackend.lo $(am__objects_4)
    419 @OS_WIN32_TRUE@am__objects_12 =  \
     416@OS_WIN32_TRUE@am__objects_11 =  \
    420417@OS_WIN32_TRUE@ libgio_2_0_la-gregistrysettingsbackend.lo
    421 @OS_COCOA_TRUE@am__objects_13 =  \
     418@OS_COCOA_TRUE@am__objects_12 =  \
    422419@OS_COCOA_TRUE@ libgio_2_0_la-gnextstepsettingsbackend.lo
    423 am__objects_14 = libgio_2_0_la-gvdb-reader.lo \
     420am__objects_13 = libgio_2_0_la-gvdb-reader.lo \
    424421        libgio_2_0_la-gdelayedsettingsbackend.lo \
    425422        libgio_2_0_la-gkeyfilesettingsbackend.lo \
    426423        libgio_2_0_la-gmemorysettingsbackend.lo \
     
    428425        libgio_2_0_la-gsettingsbackend.lo \
    429426        libgio_2_0_la-gsettingsschema.lo \
    430427        libgio_2_0_la-gsettings-mapping.lo libgio_2_0_la-gsettings.lo \
    431         $(am__objects_12) $(am__objects_13)
    432 am__objects_15 = libgio_2_0_la-gdbusutils.lo \
     428        $(am__objects_11) $(am__objects_12)
     429am__objects_14 = libgio_2_0_la-gdbusutils.lo \
    433430        libgio_2_0_la-gdbusaddress.lo \
    434431        libgio_2_0_la-gdbusauthobserver.lo libgio_2_0_la-gdbusauth.lo \
    435432        libgio_2_0_la-gdbusauthmechanism.lo \
     
    451448        libgio_2_0_la-gdbusobjectmanagerclient.lo \
    452449        libgio_2_0_la-gdbusobjectmanagerserver.lo \
    453450        libgio_2_0_la-gtestdbus.lo $(am__objects_4)
    454 am__objects_16 = libgio_2_0_la-ghttpproxy.lo \
     451am__objects_15 = libgio_2_0_la-ghttpproxy.lo \
    455452        libgio_2_0_la-glocalfile.lo \
    456453        libgio_2_0_la-glocalfileenumerator.lo \
    457454        libgio_2_0_la-glocalfileinfo.lo \
     
    545542        libgio_2_0_la-gzlibcompressor.lo \
    546543        libgio_2_0_la-gzlibdecompressor.lo \
    547544        libgio_2_0_la-gioenumtypes.lo libgio_2_0_la-glistmodel.lo \
    548         libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_7) \
    549         $(am__objects_10) $(am__objects_11) $(am__objects_14) \
    550         $(am__objects_15) $(am__objects_16) $(am__objects_4)
     545        libgio_2_0_la-gliststore.lo $(am__objects_3) $(am__objects_6) \
     546        $(am__objects_9) $(am__objects_10) $(am__objects_13) \
     547        $(am__objects_14) $(am__objects_15) $(am__objects_4)
    551548libgio_2_0_la_OBJECTS = $(am_libgio_2_0_la_OBJECTS)
    552549AM_V_lt = $(am__v_lt_@AM_V@)
    553550am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     
    14161413        $(NULL)
    14171414
    14181415platform_libadd = $(am__append_20) $(am__append_23) $(am__append_26) \
    1419         $(am__append_30) $(am__append_35)
     1416        $(am__append_30) $(am__append_34)
    14201417platform_deps = $(am__append_21) $(am__append_24) $(am__append_27) \
    14211418        $(am__append_31)
    1422 appinfo_sources = $(am__append_29) $(am__append_34)
     1419appinfo_sources = $(am__append_29) $(am__append_33)
    14231420@OS_UNIX_TRUE@unix_sources = gfiledescriptorbased.c gunixconnection.c \
    14241421@OS_UNIX_TRUE@  gunixcredentialsmessage.c gunixfdlist.c \
    14251422@OS_UNIX_TRUE@  gunixfdmessage.c gunixmount.c gunixmount.h \
     
    14291426@OS_UNIX_TRUE@  gunixoutputstream.c gcontenttype.c \
    14301427@OS_UNIX_TRUE@  gcontenttypeprivate.h gfdonotificationbackend.c \
    14311428@OS_UNIX_TRUE@  ggtknotificationbackend.c $(NULL) \
    1432 @OS_UNIX_TRUE@  $(am__append_32) $(am__append_33)
     1429@OS_UNIX_TRUE@  $(am__append_32)
    14331430@OS_UNIX_TRUE@giounixincludedir = $(includedir)/gio-unix-2.0/gio
    14341431@OS_UNIX_TRUE@giounixinclude_HEADERS = \
    14351432@OS_UNIX_TRUE@  gdesktopappinfo.h       \
     
    16501647@OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res = gio-win32-res.o
    16511648@OS_WIN32_AND_DLL_COMPILATION_TRUE@gio_win32_res_ldflag = -Wl,$(gio_win32_res)
    16521649libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS) \
    1653         $(am__append_36)
     1650        $(am__append_35)
    16541651libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) $(gio_win32_res_ldflag) \
    16551652        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
    1656         -export-dynamic $(no_undefined) $(am__append_37)
     1653        -export-dynamic $(no_undefined) $(am__append_36)
    16571654libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
    16581655gio_headers = \
    16591656        gappinfo.h              \
     
    22062203@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gbytesicon.Plo@am__quote@
    22072204@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcancellable.Plo@am__quote@
    22082205@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcharsetconverter.Plo@am__quote@
    2209 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo@am__quote@
    22102206@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype-win32.Plo@am__quote@
    22112207@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontenttype.Plo@am__quote@
    22122208@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgio_2_0_la-gcontextspecificgroup.Plo@am__quote@
     
    33243320@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    33253321@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
    33263322
    3327 libgio_2_0_la-gcocoanotificationbackend.lo: gcocoanotificationbackend.c
    3328 @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
    3329 @am__fastdepCC_TRUE@    $(AM_V_at)$(am__mv) $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Tpo $(DEPDIR)/libgio_2_0_la-gcocoanotificationbackend.Plo
    3330 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='gcocoanotificationbackend.c' object='libgio_2_0_la-gcocoanotificationbackend.lo' libtool=yes @AMDEPBACKSLASH@
    3331 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    3332 @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
    3333 
    33343323libgio_2_0_la-gnetworkmonitornetlink.lo: gnetworkmonitornetlink.c
    33353324@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
    33363325@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.