[gimp/osx-build] Keep separators between menu placeholders

[Sven Claussner <sclaussner src gnome org>]

commit fccec1804ad29620a4f48f17e207531a1d652f07
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sat May 24 19:09:38 2014 +0200

    Keep separators between menu placeholders
    
    Bugfix for missing separators in some menus, for instance in the File
    menu between 'Send E-Mail' and 'Properties' etc.

 build/osx/gimp.modules                             |    5 +--
 ...0003-Keep-separators-between-placeholders.patch |   30 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index baa137c..e20897e 100755
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -342,10 +342,9 @@
                        <patch
                                file="0002-Improve-internationalization-of-App-menu-and-other-s.patch"
                                strip="1" />
+                       <patch file="0003-Keep-separators-between-placeholders.patch"
+                               strip="1" />
                </branch>
-               <dependencies>
-                       <!--<dep package="gtk-2.24"/> -->
-               </dependencies>
        </autotools>
 
        <autotools id="libcroco" autogen-sh="configure"
diff --git a/build/osx/patches/0003-Keep-separators-between-placeholders.patch 
b/build/osx/patches/0003-Keep-separators-between-placeholders.patch
new file mode 100644
index 0000000..fa8984a
--- /dev/null
+++ b/build/osx/patches/0003-Keep-separators-between-placeholders.patch
@@ -0,0 +1,30 @@
+From c0d51b2863789ebda9b98e8a55a52af32c0974b7 Mon Sep 17 00:00:00 2001
+From: Sven Claussner <sclaussner src gnome org>
+Date: Fri, 23 May 2014 05:17:08 +0200
+Subject: [PATCH] Keep separators between placeholders.
+
+Don't remove adjacent separators.
+---
+ src/cocoa_menu_item.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/cocoa_menu_item.c b/src/cocoa_menu_item.c
+index 793c254..aebf364 100644
+--- a/src/cocoa_menu_item.c
++++ b/src/cocoa_menu_item.c
+@@ -665,10 +665,8 @@ cocoa_menu_item_add_submenu (GtkMenuShell *menu_shell,
+         /* Don't want separators on the menubar */
+         continue;
+ 
+-      if (GTK_IS_SEPARATOR_MENU_ITEM (menu_item) &&
+-        (last_item == NULL || GTK_IS_SEPARATOR_MENU_ITEM (last_item)))
+-      /* Don't put a separator at the top, nor make separators with
+-       * nothing between them.
++      if (GTK_IS_SEPARATOR_MENU_ITEM (menu_item) && (last_item == NULL))
++      /* Don't put a separator at the top.
+        */
+       continue;
+ 
+-- 
+1.9.2
+