gnucash maint: Change gtk-mac-integration package name and includes.

John Ralls jralls at code.gnucash.org
Tue Mar 31 16:16:25 EDT 2015


Updated	 via  https://github.com/Gnucash/gnucash/commit/46f75515 (commit)
	from  https://github.com/Gnucash/gnucash/commit/c755ca57 (commit)



commit 46f755152380adeff879a02c58b1c7941fe3724e
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Mar 31 12:31:19 2015 -0700

    Change gtk-mac-integration package name and includes.
    
    Reflecting change in the dependency.

diff --git a/configure.ac b/configure.ac
index 1f33d3a..761f3fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,7 +366,7 @@ update to latest  darwin])
       platform=darwin/quartz
       AC_MSG_RESULT(yes)
       AC_DEFINE(GDK_QUARTZ,,[Using GDK Quartz (not X11)])
-      PKG_CHECK_MODULES([GTK_MAC], gtk-mac-integration,
+      PKG_CHECK_MODULES([GTK_MAC], gtk-mac-integration-gtk2,
                         [_gtk_mac=yes], [_gtk_mac=no])
       if test "x$_gtk_mac" = xyes; then
         GTK_MAC_LIBS="${GTK_MAC_LIBS} -lobjc -framework Cocoa"
diff --git a/src/core-utils/binreloc.c b/src/core-utils/binreloc.c
index 68c6724..54904ce 100644
--- a/src/core-utils/binreloc.c
+++ b/src/core-utils/binreloc.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #ifdef MAC_INTEGRATION
-#include <gtkmacintegration/gtkosxapplication.h>
+#include <gtkmacintegration-gtk2/gtkosxapplication.h>
 #endif
 #endif /* ENABLE_BINRELOC */
 #include <stdio.h>
diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
index 048d00f..adf94fe 100644
--- a/src/gnome-utils/gnc-main-window.c
+++ b/src/gnome-utils/gnc-main-window.c
@@ -70,7 +70,7 @@
 #include "gnc-autosave.h"
 #include "print-session.h"
 #ifdef MAC_INTEGRATION
-#include <gtkmacintegration/gtkosxapplication.h>
+#include <gtkmacintegration-gtk2/gtkosxapplication.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 # include <sys/types.h>



Summary of changes:
 configure.ac                      | 2 +-
 src/core-utils/binreloc.c         | 2 +-
 src/gnome-utils/gnc-main-window.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list