[gtk-osx] [GtkSourceView] [Bug 664511] [Bug 664679] Accomodate gtk-mac-integration

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx] [GtkSourceView] [Bug 664511] [Bug 664679] Accomodate gtk-mac-integration
Date: Thu, 24 Nov 2011 00:31:50 +0000 (UTC)
commit f4c018f9d703ef6aaec971459cfdcbf218f7a955
Author: Philip Chimento <philip chimento gmail com>
Date:   Wed Nov 23 16:26:57 2011 -0800

    [GtkSourceView] [Bug 664511] [Bug 664679] Accomodate gtk-mac-integration
    
    
    This patch ports gtksourceview and gtksourceview3 to
    GtkOSXApplication. They only use it to detect whether the program
    is running in a bundle and if so, get the locale directory.
    Gtksourceview3 also includes a patch for configure.ac that
    fixes detecting whether to build for OS X or not.

 modulesets-stable/gtk-osx-random.modules           |   12 +-
 .../gtksourceview-664511-gtkosxapplication.patch   |  234 ++++++++++++++++++++
 .../gtksourceview3-664511-gtkosxapplication.patch  |   79 +++++++
 patches/gtksourceview3-664679-backends.patch       |   38 ++++
 4 files changed, 360 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 2aedbc3..9bda70c 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -162,7 +162,9 @@ Libglade itself is deprecated. This is the last release. -->
 <!-- gtksourceview-2.10.5 is the last version that supports Gtk+-2 -->
   <autotools id="gtksourceview" autogen-sh="configure">
     <branch module="gtksourceview/2.10/gtksourceview-2.10.5.tar.bz2"
-            version="2.10.5" hash="sha256:c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"/>
+            version="2.10.5" hash="sha256:c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtksourceview-664511-gtkosxapplication.patch"; strip="1"/>
+    </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-core"/>
@@ -170,9 +172,13 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
 
-  <autotools id="gtksourceview3" autogen-sh="configure">
+  <autotools id="gtksourceview3"
+    autogen-template="gnome-autogen.sh --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
     <branch module="gtksourceview/3.2/gtksourceview-3.2.0.tar.bz2"
-            version="3.2.0" hash="sha256:82b1028d69fcb24650ebc801454eb688dc3a01c6061c1d77d1cf665f048f050a"/>
+            version="3.2.0" hash="sha256:82b1028d69fcb24650ebc801454eb688dc3a01c6061c1d77d1cf665f048f050a">
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtksourceview3-664679-backends.patch"; strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gtksourceview3-664511-gtkosxapplication.patch"; strip="1"/>
+    </branch>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
       <dep package="meta-gtk-osx-gtk3"/>
diff --git a/patches/gtksourceview-664511-gtkosxapplication.patch b/patches/gtksourceview-664511-gtkosxapplication.patch
new file mode 100644
index 0000000..2b2e3e9
--- /dev/null
+++ b/patches/gtksourceview-664511-gtkosxapplication.patch
@@ -0,0 +1,234 @@
+diff -Naur gtksourceview-2.10.5/configure gtksourceview-2.10.5-patched/configure
+--- gtksourceview-2.10.5/configure	2010-09-28 11:43:55.000000000 +0200
++++ gtksourceview-2.10.5-patched/configure	2011-11-17 08:55:22.000000000 +0100
+@@ -669,8 +677,8 @@
+ GLADE_CATALOGDIR
+ GLADE_CATALOG_FALSE
+ GLADE_CATALOG_TRUE
+-IGE_MAC_LIBS
+-IGE_MAC_CFLAGS
++GTK_MAC_LIBS
++GTK_MAC_CFLAGS
+ OS_OSX_FALSE
+ OS_OSX_TRUE
+ ENABLE_PROVIDERS_FALSE
+@@ -830,8 +838,8 @@
+ PKG_CONFIG_LIBDIR
+ DEP_CFLAGS
+ DEP_LIBS
+-IGE_MAC_CFLAGS
+-IGE_MAC_LIBS'
++GTK_MAC_CFLAGS
++GTK_MAC_LIBS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1497,10 +1506,10 @@
+               path overriding pkg-config's built-in search path
+   DEP_CFLAGS  C compiler flags for DEP, overriding pkg-config
+   DEP_LIBS    linker flags for DEP, overriding pkg-config
+-  IGE_MAC_CFLAGS
+-              C compiler flags for IGE_MAC, overriding pkg-config
+-  IGE_MAC_LIBS
+-              linker flags for IGE_MAC, overriding pkg-config
++  GTK_MAC_CFLAGS
++              C compiler flags for GTK_MAC, overriding pkg-config
++  GTK_MAC_LIBS
++              linker flags for GTK_MAC, overriding pkg-config
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -11213,35 +11220,35 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IGE_MAC" >&5
+-$as_echo_n "checking for IGE_MAC... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5
++$as_echo_n "checking for GTK_MAC... " >&6; }
+ 
+-if test -n "$IGE_MAC_CFLAGS"; then
+-    pkg_cv_IGE_MAC_CFLAGS="$IGE_MAC_CFLAGS"
++if test -n "$GTK_MAC_CFLAGS"; then
++    pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_IGE_MAC_CFLAGS=`$PKG_CONFIG --cflags "ige-mac-integration" 2>/dev/null`
++  pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+  else
+     pkg_failed=untried
+ fi
+-if test -n "$IGE_MAC_LIBS"; then
+-    pkg_cv_IGE_MAC_LIBS="$IGE_MAC_LIBS"
++if test -n "$GTK_MAC_LIBS"; then
++    pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ige-mac-integration\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "ige-mac-integration") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_IGE_MAC_LIBS=`$PKG_CONFIG --libs "ige-mac-integration" 2>/dev/null`
++  pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -11261,24 +11268,23 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ige-mac-integration" 2>&1`
++	        GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-mac-integration" 2>&1`
+         else
+-	        IGE_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ige-mac-integration" 2>&1`
++	        GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-mac-integration" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+-	echo "$IGE_MAC_PKG_ERRORS" >&5
++	echo "$GTK_MAC_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (ige-mac-integration) were not met:
++	as_fn_error $? "Package requirements (gtk-mac-integration) were not met:
+ 
+-$IGE_MAC_PKG_ERRORS
++$GTK_MAC_PKG_ERRORS
+ 
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+-and IGE_MAC_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTK_MAC_CFLAGS
++and GTK_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -11288,16 +11294,15 @@
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+-Alternatively, you may set the environment variables IGE_MAC_CFLAGS
+-and IGE_MAC_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GTK_MAC_CFLAGS
++and GTK_MAC_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+-
+ else
+-	IGE_MAC_CFLAGS=$pkg_cv_IGE_MAC_CFLAGS
+-	IGE_MAC_LIBS=$pkg_cv_IGE_MAC_LIBS
++	GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS
++	GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+diff -Naur gtksourceview-2.10.5/configure.ac gtksourceview-2.10.5-patched/configure.ac
+--- gtksourceview-2.10.5/configure.ac	2010-09-28 11:35:40.000000000 +0200
++++ gtksourceview-2.10.5-patched/configure.ac	2011-11-17 08:51:09.000000000 +0100
+@@ -76,7 +76,7 @@
+ if test "$os_osx" = "yes"; then
+ 	AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
+ 
+-	PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
++	PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
+ fi
+ 
+ # Check for Glade3
+diff -Naur gtksourceview-2.10.5/gtksourceview/Makefile.am gtksourceview-2.10.5-patched/gtksourceview/Makefile.am
+--- gtksourceview-2.10.5/gtksourceview/Makefile.am	2010-08-22 13:45:04.000000000 +0200
++++ gtksourceview-2.10.5-patched/gtksourceview/Makefile.am	2011-11-19 10:33:20.000000000 +0100
+@@ -10,7 +10,7 @@
+ 	-I$(top_srcdir) -I$(srcdir) 	\
+ 	$(DISABLE_DEPRECATED)		\
+ 	$(WARN_CFLAGS) 			\
+-	$(IGE_MAC_CFLAGS)		\
++	$(GTK_MAC_CFLAGS)		\
+ 	$(DEP_CFLAGS)
+ 
+ BUILT_SOURCES = 			\
+@@ -96,7 +96,7 @@
+ completion_providers = 							\
+ 	completion-providers/words/libgtksourcecompletionwords.la
+ 
+-libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers)
++libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers)
+ libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
+ libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview
+ 
+diff -Naur gtksourceview-2.10.5/gtksourceview/Makefile.in gtksourceview-2.10.5-patched/gtksourceview/Makefile.in
+--- gtksourceview-2.10.5/gtksourceview/Makefile.in	2010-09-28 11:43:57.000000000 +0200
++++ gtksourceview-2.10.5-patched/gtksourceview/Makefile.in	2011-11-19 10:33:40.000000000 +0100
+@@ -217,10 +217,10 @@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
+ GTKDOC_MKPDF = @GTKDOC_MKPDF@
+ GTKDOC_REBASE = @GTKDOC_REBASE@
++GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
++GTK_MAC_LIBS = @GTK_MAC_LIBS@
+ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+ HTML_DIR = @HTML_DIR@
+-IGE_MAC_CFLAGS = @IGE_MAC_CFLAGS@
+-IGE_MAC_LIBS = @IGE_MAC_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -336,7 +336,7 @@
+ 	-I$(top_srcdir) -I$(srcdir) 	\
+ 	$(DISABLE_DEPRECATED)		\
+ 	$(WARN_CFLAGS) 			\
+-	$(IGE_MAC_CFLAGS)		\
++	$(GTK_MAC_CFLAGS)		\
+ 	$(DEP_CFLAGS)
+ 
+ BUILT_SOURCES = \
+@@ -423,7 +423,7 @@
+ completion_providers = \
+ 	completion-providers/words/libgtksourcecompletionwords.la
+ 
+-libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers)
++libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers)
+ libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
+ libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview
+ libgtksourceview_2_0_include_HEADERS = \
+diff -Naur gtksourceview-2.10.5/gtksourceview/gtksourceview-i18n.c gtksourceview-2.10.5-patched/gtksourceview/gtksourceview-i18n.c
+--- gtksourceview-2.10.5/gtksourceview/gtksourceview-i18n.c	2010-08-22 13:45:05.000000000 +0200
++++ gtksourceview-2.10.5-patched/gtksourceview/gtksourceview-i18n.c	2011-11-19 17:39:33.000000000 +0100
+@@ -24,7 +24,7 @@
+ #endif
+ 
+ #ifdef OS_OSX
+-#include <ige-mac-bundle.h>
++#include <gtkosxapplication.h>
+ #endif
+ 
+ #include <string.h>
+@@ -45,11 +45,9 @@
+ 
+ 	g_free (win32_dir);
+ #elif defined (OS_OSX)
+-	IgeMacBundle *bundle = ige_mac_bundle_get_default ();
+-
+-	if (ige_mac_bundle_get_is_app_bundle (bundle))
++	if (quartz_application_get_bundle_id () != NULL)
+ 	{
+-		locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle));
++		locale_dir = g_build_filename (quartz_application_get_resource_path (), "share", "locale", NULL);
+ 	}
+ 	else
+ 	{
diff --git a/patches/gtksourceview3-664511-gtkosxapplication.patch b/patches/gtksourceview3-664511-gtkosxapplication.patch
new file mode 100644
index 0000000..63e32c8
--- /dev/null
+++ b/patches/gtksourceview3-664511-gtkosxapplication.patch
@@ -0,0 +1,79 @@
+From 43cdc6b7fe7470c7dc4a2482569eb4ffdff41ace Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Mon, 21 Nov 2011 22:23:00 +0100
+Subject: [PATCH] Change IgeMacIntegration to GtkOSXApplication
+
+Rename ige-mac-integration to gtk-mac-integration and replace the deprecate
+ige_mac_bundle_get_localedir with the newer
+ quartz_application_get_resource_path().
+---
+ configure.ac                       |    2 +-
+ gtksourceview/Makefile.am          |    4 ++--
+ gtksourceview/gtksourceview-i18n.c |    8 +++-----
+ 3 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7d2f39b..7d4a17f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,7 +98,7 @@ AM_CONDITIONAL([OS_OSX], [ test "$os_osx" = "yes" ])
+ if test "$os_osx" = "yes"; then
+ 	AC_DEFINE([OS_OSX], [1], [Defined if os is Mac OSX])
+ 
+-	PKG_CHECK_MODULES(IGE_MAC, ige-mac-integration)
++	PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
+ fi
+ 
+ # Check for Glade3
+diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
+index e4adeaa..e2cb296 100644
+--- a/gtksourceview/Makefile.am
++++ b/gtksourceview/Makefile.am
+@@ -8,7 +8,7 @@ INCLUDES = 				\
+ 	-I$(top_srcdir) -I$(srcdir) 	\
+ 	$(DISABLE_DEPRECATED_CFLAGS)	\
+ 	$(WARN_CFLAGS) 			\
+-	$(IGE_MAC_CFLAGS)		\
++	$(GTK_MAC_CFLAGS)		\
+ 	$(DEP_CFLAGS)
+ 
+ BUILT_SOURCES = 			\
+@@ -111,7 +111,7 @@ nodist_libgtksourceview_3_0_la_SOURCES =\
+ completion_providers = 							\
+ 	completion-providers/words/libgtksourcecompletionwords.la
+ 
+-libgtksourceview_3_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers)
++libgtksourceview_3_0_la_LIBADD = $(DEP_LIBS) $(GTK_MAC_LIBS) $(completion_providers)
+ libgtksourceview_3_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
+ libgtksourceview_3_0_includedir = $(includedir)/gtksourceview-3.0/gtksourceview
+ 
+diff --git a/gtksourceview/gtksourceview-i18n.c b/gtksourceview/gtksourceview-i18n.c
+index 997d283..64e392a 100644
+--- a/gtksourceview/gtksourceview-i18n.c
++++ b/gtksourceview/gtksourceview-i18n.c
+@@ -24,7 +24,7 @@
+ #endif
+ 
+ #ifdef OS_OSX
+-#include <ige-mac-bundle.h>
++#include <gtkosxapplication.h>
+ #endif
+ 
+ #include <string.h>
+@@ -45,11 +45,9 @@ get_locale_dir (void)
+ 
+ 	g_free (win32_dir);
+ #elif defined (OS_OSX)
+-	IgeMacBundle *bundle = ige_mac_bundle_get_default ();
+-
+-	if (ige_mac_bundle_get_is_app_bundle (bundle))
++	if (quartz_application_get_bundle_id () != NULL)
+ 	{
+-		locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle));
++		locale_dir = g_build_filename (quartz_application_get_resource_path (), "share", "locale", NULL);
+ 	}
+ 	else
+ 	{
+-- 
+1.7.3.2
+
diff --git a/patches/gtksourceview3-664679-backends.patch b/patches/gtksourceview3-664679-backends.patch
new file mode 100644
index 0000000..a62fa57
--- /dev/null
+++ b/patches/gtksourceview3-664679-backends.patch
@@ -0,0 +1,38 @@
+From 194d40ed2e6e27889b201b4c84997b1e7075a3a5 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip chimento gmail com>
+Date: Tue, 22 Nov 2011 13:05:08 +0100
+Subject: [PATCH] Allow for multiple GDK backends
+
+In GDK > 3.0, multiple backends can be built. The pkg-config
+variable that tells the backend is now called 'targets' instead of
+'target'. To determine whether to build for OS X, configure now
+needs to use the GTK_CHECK_BACKENDS macro supplied with GTK, as
+described in the migration guide:
+http://developer.gnome.org/gtk3/3.3/ch25s02.html
+---
+ configure.ac |    9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7d4a17f..3d88fe5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,14 +84,7 @@ AM_CONDITIONAL([ENABLE_PROVIDERS], [ test "$enable_providers" = "yes" ])
+ 
+ dnl check for native osx
+ AC_MSG_CHECKING([for native Mac OS X])
+-
+-gdk_windowing=`$PKG_CONFIG --variable=target gdk-3.0`
+-
+-if test "$gdk_windowing" = "quartz"; then
+-	os_osx=yes
+-else
+-	os_osx=no
+-fi
++GTK_CHECK_BACKEND([quartz], [3.0.0], [os_osx=yes], [os_osx=no])
+ AC_MSG_RESULT([$os_osx])
+ AM_CONDITIONAL([OS_OSX], [ test "$os_osx" = "yes" ])
+ 
+-- 
+1.7.3.2
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]