Ticket #31441: DisableMacIntegration.diff

File DisableMacIntegration.diff, 4.7 KB (added by gellule.xg@…, 5 years ago)

Patch to remove all trace of quartz/ige-mac-integration

  • configure.ac

    diff --git configure.ac configure.ac
    index 5970a32..1cd97a8 100644
    if test "$native_win32" = "yes"; then 
    224224  fi
    225225fi
    226226
    227 dnl ================================================================
    228 dnl Check for GDK Quartz and MacOSX integration package
    229 dnl ================================================================
    230 _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
    231 AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
    232 if test "x$_gdk_tgt" = xquartz; then
    233    PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
    234 
    235    IGE_MAC_BUNDLE_FLAG=
    236 
    237    AC_ARG_ENABLE(mac-bundle,
    238       AS_HELP_STRING([--enable-mac-bundle], [enable mac bundling]),
    239       build_bundle=yes, build_bundle=no)
    240 
    241    if test "x$build_bundle" = xyes; then
    242       AC_MSG_NOTICE([enableing mac bundle..])
    243 
    244       IGE_MAC_BUNDLE_FLAG=-DMAC_BUNDLE
    245    fi     
    246 
    247    AC_SUBST(IGE_MAC_BUNDLE_FLAG)
    248    AC_SUBST(IGE_MAC_LIBS)
    249    AC_SUBST(IGE_MAC_CFLAGS)
    250 fi
    251 
    252227AC_SUBST([AM_CPPFLAGS])
    253228AC_SUBST([AM_CFLAGS])
    254229AC_SUBST([AM_CXXFLAGS])
  • gladeui/Makefile.am

    diff --git gladeui/Makefile.am gladeui/Makefile.am
    index c2ef6e4..90e928f 100644
    libgladeui_1_la_CPPFLAGS = \ 
    6767        -I$(top_srcdir)     \
    6868        -I$(top_builddir)   \
    6969        $(GTK_CFLAGS)       \
    70         $(IGE_MAC_BUNDLE_FLAG) \
    71         $(IGE_MAC_CFLAGS)  \
    7270        $(WARN_CFLAGS)      \
    7371        $(AM_CPPFLAGS)
    7472
    libgladeui_1_la_CFLAGS = \ 
    7674        $(AM_CFLAGS)
    7775
    7876libgladeui_1_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
    79 libgladeui_1_la_LIBADD = $(GTK_LIBS) $(IGE_MAC_LIBS)
     77libgladeui_1_la_LIBADD = $(GTK_LIBS)
    8078
    8179
    8280libgladeuiincludedir=$(includedir)/libgladeui-1.0/gladeui
  • gladeui/glade-app.c

    diff --git gladeui/glade-app.c gladeui/glade-app.c
    index 88cdd48..0bff5da 100644
     
    4848#include <gdk/gdkkeysyms.h>
    4949#include <gtk/gtk.h>
    5050
    51 #ifdef MAC_INTEGRATION
    52 #  include <ige-mac-integration.h>
    53 #endif
    54 
    5551#define GLADE_CONFIG_FILENAME "glade-3.conf"
    5652
    5753#define GLADE_APP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GLADE_TYPE_APP, GladeAppPrivate))
    glade_app_get_bin_dir (void) 
    373369static void
    374370build_package_paths (void)
    375371{
    376 #if defined (G_OS_WIN32) || (defined (MAC_INTEGRATION) && defined (MAC_BUNDLE))
     372#if defined (G_OS_WIN32)
    377373        gchar *prefix;
    378374
    379 # ifdef G_OS_WIN32
    380375        prefix = g_win32_get_package_installation_directory_of_module (NULL);
    381376
    382 # else // defined (MAC_INTEGRATION) && defined (MAC_BUNDLE)
    383         IgeMacBundle *bundle = ige_mac_bundle_get_default ();
    384 
    385         prefix = g_build_filename (ige_mac_bundle_get_path (bundle), "Contents", "Resources", NULL);
    386 # endif
    387 
    388377        pixmaps_dir  = g_build_filename (prefix, "share", PACKAGE, "pixmaps", NULL);
    389378        catalogs_dir = g_build_filename (prefix, "share", PACKAGE, "catalogs", NULL);
    390379        modules_dir  = g_build_filename (prefix, "lib", PACKAGE, "modules", NULL);
  • gladeui/glade-popup.c

    diff --git gladeui/glade-popup.c gladeui/glade-popup.c
    index 5c8679f..d028951 100644
    glade_popup_is_popup_event (GdkEventButton *event) 
    838838{
    839839        g_return_val_if_fail (event, FALSE);
    840840
    841 #ifdef MAC_INTEGRATION
    842         return (event->type == GDK_BUTTON_PRESS && event->button == 1 && ((event->state & GDK_MOD1_MASK) != 0));
    843 #else
    844841        return (event->type == GDK_BUTTON_PRESS && event->button == 3);
    845 #endif
    846842}
    847843
  • src/Makefile.am

    diff --git src/Makefile.am src/Makefile.am
    index 4ec720a..2c4f86c 100644
    glade_3_CPPFLAGS = \ 
    77        -I$(top_builddir)  \
    88        -DGLADE_GNOMEHELPDIR="\"$(HELP_DIR)\"" \
    99        $(GTK_CFLAGS)      \
    10         $(IGE_MAC_CFLAGS)  \
    1110        $(WARN_CFLAGS)     \
    1211        $(AM_CPPFLAGS)
    1312
    glade_3_CFLAGS = \ 
    1615
    1716glade_3_LDFLAGS = $(AM_LDFLAGS)
    1817
    19 glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la $(IGE_MAC_LIBS)
     18glade_3_LDADD = $(top_builddir)/gladeui/libgladeui-1.la
    2019
    2120glade_3_SOURCES = \
    2221        glade-window.c \
  • src/glade-window.c

    diff --git src/glade-window.c src/glade-window.c
    index b21dba7..6d43671 100644
     
    4141#include <gdk/gdkkeysyms.h>
    4242#include <gtk/gtk.h>
    4343
    44 #ifdef MAC_INTEGRATION
    45 #  include <ige-mac-integration.h>
    46 #endif
    47 
    4844
    4945#define ACTION_GROUP_STATIC             "GladeStatic"
    5046#define ACTION_GROUP_PROJECT            "GladeProject"
    glade_window_init (GladeWindow *window) 
    33663362
    33673363        glade_window_config_load (window);
    33683364
    3369 #ifdef MAC_INTEGRATION
    3370         {
    3371                 /* Fix up the menubar for MacOSX Quartz builds */
    3372                 gtk_widget_hide (menubar);
    3373                 ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menubar));
    3374                
    3375                 widget = gtk_ui_manager_get_widget (window->priv->ui, "/MenuBar/FileMenu/Quit");
    3376                 ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (widget));
    3377         }
    3378 #endif
    3379 
    3380 
    33813365}
    33823366
    33833367static void