Ticket #48588: patch-gtkosxapplication.diff

File patch-gtkosxapplication.diff, 3.4 KB (added by wdc@…, 6 years ago)

Corrects defect 41984

  • configure.ac

    This patch incorporates two commits in the tree at the Gnome Repository
    that were never released.  It fixes the problem of gtksourceview2 failing to build under 
    Mavericks and later when both gtk2 and gtk3 macports are installed.
    This version of the patch uses the upstream package naming conventions that
    are canon as of August 2015.
    
    From e88357c5f210a8796104505c090fb6a04c213902 Mon Sep 17 00:00:00 2001
    From: Philip Chimento <philip.chimento@gmail.com>
    Date: Mon, 21 Nov 2011 22:26:21 +0100
    Subject: Change IgeMacIntegration to GtkOSXApplication
    
    Instead of using the deprecated IgeMacIntegration which doesn't work
    on 32-bit Macs, get the locale dir using the quartz_application_...
    API from GtkOSXApplication.
    
    From e38712a2061f6f45116f6316fd32cc166c68baf6 Mon Sep 17 00:00:00 2001
    From: Pierre Boutillier <pierre.boutillier@ens-lyon.org>
    Date: Tue, 6 Nov 2012 15:49:43 +0100
    Subject: Update to gtk-mac-integration 2.0 API
    
    Fixes bgo#687766. quartz_application_... becomes
    gtkosx_application_...
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687766
    
    
    diff --git configure.ac configure.ac
    index ccfe986..42fe313 100644
    AM_CONDITIONAL(OS_OSX, test "$os_osx" = "yes") 
    7676if test "$os_osx" = "yes"; then
    7777        AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
    7878
    79         PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
     79        PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2 >= 2.0.0)
    8080fi
    8181
    8282# Check for Glade3
  • gtksourceview/Makefile.am

    diff --git gtksourceview/Makefile.am gtksourceview/Makefile.am
    index f3781d5..d1136a4 100644
    INCLUDES = \ 
    1010        -I$(top_srcdir) -I$(srcdir)     \
    1111        $(DISABLE_DEPRECATED)           \
    1212        $(WARN_CFLAGS)                  \
    13         $(IGE_MAC_CFLAGS)               \
     13        $(GTK_MAC_CFLAGS)               \
    1414        $(DEP_CFLAGS)
    1515
    1616BUILT_SOURCES =                         \
    nodist_libgtksourceview_2_0_la_SOURCES =\ 
    9696completion_providers =                                                  \
    9797        completion-providers/words/libgtksourcecompletionwords.la
    9898
    99 libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers)
     99libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers)
    100100libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
    101101libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview
    102102
  • gtksourceview/gtksourceview-i18n.c

    diff --git gtksourceview/gtksourceview-i18n.c gtksourceview/gtksourceview-i18n.c
    index e4db3eb..32f8068 100644
     
    2424#endif
    2525
    2626#ifdef OS_OSX
    27 #include <ige-mac-bundle.h>
     27#include <gtkosxapplication.h>
    2828#endif
    2929
    3030#include <string.h>
    get_locale_dir (void) 
    4545
    4646        g_free (win32_dir);
    4747#elif defined (OS_OSX)
    48         IgeMacBundle *bundle = ige_mac_bundle_get_default ();
    49 
    50         if (ige_mac_bundle_get_is_app_bundle (bundle))
     48        if (gtkosx_application_get_bundle_id () != NULL)
    5149        {
    52                 locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle));
     50                locale_dir = g_build_filename (gtkosx_application_get_resource_path (), "share", "locale", NULL);
    5351        }
    5452        else
    5553        {
  • tests/Makefile.am

    diff --git a/tests/Makefile.am b/tests/Makefile.am
    index dfca414..1c6085b 100644
    test_regex_SOURCES = test-regex.c 
    7878test_regex_LDADD =                                              \
    7979        $(top_builddir)/gtksourceview/libgtksourceview-private.la       \
    8080        $(DEP_LIBS)                     \
     81        $(GTK_MAC_LIBS)         \
    8182        $(TESTS_LIBS)
    8283
    8384UNIT_TEST_PROGS += test-completion-model