[gimp/osx-build: 21/31] Translate OS X app menu properly.

[Sven Claussner <sclaussner src gnome org>]

commit 51c1244558279746a2cc4f9810374652ac46fc85
Author: Sven Claussner <sclaussner src gnome org>
Date:   Thu May 15 06:49:00 2014 +0200

    Translate OS X app menu properly.

 build/osx/gimp-2.8-python.bundle                   |    9 +--------
 build/osx/gimp-master-python.bundle                |    8 +-------
 build/osx/gimp.modules                             |   18 +++++++++++++-----
 ...ernationalization-of-App-menu-and-other-s.patch |  Bin 0 -> 41273 bytes
 4 files changed, 15 insertions(+), 20 deletions(-)
---
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index e666d63..b277042 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -157,14 +157,7 @@
        <translations name="libsecret">${prefix}/share/locale</translations>
        <translations name="libsoup">${prefix}/share/locale</translations>
        <translations name="shared-mime-info">${prefix}/share/locale</translations>
-
-       <!-- preparation to copy the GTK-Mac-Integration translation strings (Services, 
-               Hide, Show all, Quit etc.) in the 'GIMP' menu to the same place where Simone 
-               (skl) puts them. 
-               TODO: examine, understand and apply her solution. See also: 
-               
http://sourceforge.net/p/gimponosx/code/HEAD/tree/GimpPorts/ports/graphics/gimp2/files/app-gui-gui-unique.c.diff
 
-               https://github.com/jralls/gtk-mac-integration/blob/master/README -->
-       <!-- data dest="${bundle}/Contents/Resources">${prefix}/share/strings</data -->
+       <data dest="${bundle}/Contents/Resources">${prefix}/share/strings</data>
 
        <!-- Copy in mime data -->
        <!-- Used for opening up help in browser -->
diff --git a/build/osx/gimp-master-python.bundle b/build/osx/gimp-master-python.bundle
index 35d2d0c..dc0af6d 100755
--- a/build/osx/gimp-master-python.bundle
+++ b/build/osx/gimp-master-python.bundle
@@ -159,13 +159,7 @@
        <translations name="libsecret">${prefix}/share/locale</translations>
        <translations name="libsoup">${prefix}/share/locale</translations>
        <translations name="shared-mime-info">${prefix}/share/locale</translations>
-
-       <!-- preparation to copy the GTK-Mac-Integration translation strings (Services, 
-               Hide, Show all, Quit etc.) in the 'GIMP' menu to the same place where Simone 
-               (skl) puts them. TODO: examine, understand and apply her solution. See also: 
-               
http://sourceforge.net/p/gimponosx/code/HEAD/tree/GimpPorts/ports/graphics/gimp2/files/app-gui-gui-unique.c.diff
 
-               https://github.com/jralls/gtk-mac-integration/blob/master/README -->
-       <!-- data dest="${bundle}/Contents/Resources">${prefix}/share/strings</data -->
+       <data dest="${bundle}/Contents/Resources">${prefix}/share/strings</data>
 
        <!-- Copy in mime data -->
        <!-- Used for opening up help in browser -->
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index 677dd56..2f74bd3 100755
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -2,8 +2,7 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-       <repository type="git" name="github"
-               href="https://github.com/"; />
+       <repository type="git" name="github" href="https://github.com/"; />
 
        <repository type="tarball" name="sourceforge"
                href="http://downloads.sourceforge.net/sourceforge/"; />
@@ -339,7 +338,11 @@
                autogenargs="--with-gtk=gtk+-2.0">
                <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.5.tar.xz"
                        version="2.0.5"
-                       hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f" />
+                       hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f">
+                       <patch
+                               file="0002-Improve-internationalization-of-App-menu-and-other-s.patch"
+                               strip="1" />
+               </branch>
                <dependencies>
                        <!--<dep package="gtk-2.24"/> -->
                </dependencies>
@@ -989,7 +992,8 @@
        </autotools>
 
        <autotools id="gtk-quartz-engine" autogen-sh="autogen.sh">
-               <branch module="jralls/gtk-quartz-engine.git" repo="github" revision="master" />
+               <branch module="jralls/gtk-quartz-engine.git" repo="github"
+                       revision="master" />
                <after>
                        <dep package="gtk+-2.24" />
                </after>
@@ -1119,7 +1123,11 @@
                autogenargs="--enable-python --with-gtk=gtk+-2.0">
                <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.5.tar.xz"
                        version="2.0.5"
-                       hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f" />
+                       hash="sha256:6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f">
+                       <patch
+                               file="0002-Improve-internationalization-of-App-menu-and-other-s.patch"
+                               strip="1" />
+               </branch>
                <dependencies>
                </dependencies>
                <after>
diff --git a/build/osx/patches/0002-Improve-internationalization-of-App-menu-and-other-s.patch 
b/build/osx/patches/0002-Improve-internationalization-of-App-menu-and-other-s.patch
new file mode 100755
index 0000000..5188a91
Binary files /dev/null and 
b/build/osx/patches/0002-Improve-internationalization-of-App-menu-and-other-s.patch differ