[gimp/osx-build] Rework GIMP's OS X theme for improved OS X integration

[Sven Claussner <sclaussner src gnome org>]

commit 16cd5e79f771e05086c6e239ad19bfd9f5316f1a
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sat May 24 18:51:28 2014 +0200

    Rework GIMP's OS X theme for improved OS X integration
    
    Combine the strengths of Zukitwo and GNOME-Cupertino,
    adapt overall color appearance to OS X 10.9,
    integrate Mac key bindings from GTK+ 2.24,
    force consistent implementation,
    fix flaws,
    update bundler configuration and README,
    cleanups.

 build/osx/README                    |    5 +----
 build/osx/custom/gtkrc              |   17 +++++++----------
 build/osx/gimp-2.8-python.bundle    |   12 ++++++------
 build/osx/gimp-master-python.bundle |    6 +++---
 build/osx/gimp.modules              |   10 ++++++++++
 5 files changed, 27 insertions(+), 23 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index b4f0542..923bf17 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -94,10 +94,7 @@ This error is irrelevant. The OpenSSL install procedure failes erroneously altho
 all library parts were installed successfully. Thus you can continue to the next
 module by choosing option 2.
 
-6. If you would like the GTK Murrine theme, you can install it as well
-# JHB=gimp GIMP_SDK=10.6 jhbuild build murrine-engine
-
-7. In order to run GIMP with D-Bus support (required for GVFS and GIO)
+6. In order to run GIMP with D-Bus support (required for GVFS and GIO)
 $ dbus-launch gimp-2.8
 
 This will generate a D-Bus session. If you continuously run GIMP using this method, 
diff --git a/build/osx/custom/gtkrc b/build/osx/custom/gtkrc
index fd46231..6be01b1 100644
--- a/build/osx/custom/gtkrc
+++ b/build/osx/custom/gtkrc
@@ -1,14 +1,11 @@
-# Include Zukitwo path to fix plugins not applying theme
-include "../../share/themes/Zukitwo/gtk-2.0/gtkrc"
-# Set default theme to Zukitwo
-gtk-theme-name = "Zukitwo"
+# Set default theme to Mac
+gtk-theme-name = "Mac"
 
-# Include Elementary path to fix plugins not applying theme
-# include "../../share/themes/Elementary/gtk-2.0/gtkrc"
-# Set default theme to Elementary
-# gtk-theme-name = "Elementary"
+# Include Mac path to fix plugins not applying theme
+include "../../share/themes/Mac/gtk-2.0/gtkrc"
+
+# Set default key-bindings to Mac
+gtk-key-theme-name = "Mac"
 
 # Include Mac path to fix plugins not applying key-bindings
 include "../../share/themes/Mac/gtk-2.0-key/gtkrc"
-# Set default key-bindings to Mac
-gtk-key-theme-name = "Mac"
\ No newline at end of file
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index b277042..7e89bf1 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -124,8 +124,8 @@
                ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
        </binary>
 
-       <!-- Copy in translations -->
-       <!-- - copy in GIMP and GEGL translations - -->
+       <!-- Translations -->
+       <!-- - GIMP and GEGL translations - -->
        <translations name="gegl-0.2">${prefix}/share/locale</translations>
        <translations name="gimp20-libgimp">${prefix}/share/locale</translations>
        <translations name="gimp20-python">${prefix}/share/locale</translations>
@@ -134,7 +134,7 @@
        <translations name="gimp20-tips">${prefix}/share/locale</translations>
        <translations name="gimp20">${prefix}/share/locale</translations>
 
-       <!-- - copy in ISO-Code Package translations (language names) - -->
+       <!-- - ISO-Code Package translations (language names) - -->
        <translations name="iso_15924">${prefix}/share/locale</translations>
        <translations name="iso_3166">${prefix}/share/locale</translations>
        <translations name="iso_3166_2">${prefix}/share/locale</translations>
@@ -142,7 +142,7 @@
        <translations name="iso_639">${prefix}/share/locale</translations>
        <translations name="iso_639_3">${prefix}/share/locale</translations>
 
-       <!-- - copy in miscellanous translations- -->
+       <!-- - miscellanous translations- -->
        <translations name="atk10">${prefix}/share/locale</translations>
        <translations name="gdk-pixbuf">${prefix}/share/locale</translations>
        <translations name="gettext-tools">${prefix}/share/locale</translations>
@@ -204,10 +204,10 @@
        <data>${prefix}/etc/xml/catalog</data>
 
        <!-- Copy in themes -->
-       <data>${prefix}/share/themes</data>
+       <data>${prefix}/share/themes/Mac</data>
 
        <!-- Copy in GTK+ theme data -->
-       <!-- data>${prefix}/share/gtk-engines/*.xml</data -->
+       <data>${prefix}/share/gtk-engines/*.xml</data>
 
        <!-- Change default theme -->
        <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
diff --git a/build/osx/gimp-master-python.bundle b/build/osx/gimp-master-python.bundle
index dc0af6d..9b86498 100755
--- a/build/osx/gimp-master-python.bundle
+++ b/build/osx/gimp-master-python.bundle
@@ -135,7 +135,7 @@
        <translations name="gimp20-tips">${prefix}/share/locale</translations>
        <translations name="gimp20">${prefix}/share/locale</translations>
 
-       <!-- - ISO-Code Package translations - -->
+       <!-- - ISO-Code Package translations (language names) - -->
        <translations name="iso_15924">${prefix}/share/locale</translations>
        <translations name="iso_3166">${prefix}/share/locale</translations>
        <translations name="iso_3166_2">${prefix}/share/locale</translations>
@@ -206,10 +206,10 @@
        <data>${prefix}/etc/xml/catalog</data>
 
        <!-- Copy in themes -->
-       <data>${prefix}/share/themes</data>
+       <data>${prefix}/share/themes/Mac</data>
 
        <!-- Copy in GTK+ theme data -->
-       <!-- data>${prefix}/share/gtk-engines/*.xml</data -->
+       <data>${prefix}/share/gtk-engines/*.xml</data>
 
        <!-- Change default theme -->
        <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index 2f74bd3..baa137c 100755
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -853,6 +853,7 @@
                        <dep package="jasper" />
                        <dep package="meta-gtk-osx-python" />
                        <dep package="tango-icon-theme" />
+                       <dep package="gimp-osx-theme" />
                        <dep package="gvfs" />
                        <dep package="curl" />
                        <dep package="gtk-mac-integration-python2" />
@@ -924,6 +925,15 @@
                </dependencies>
        </autotools>
 
+       <autotools id="gimp-osx-theme" autogen-sh="autogen.sh">
+               <branch repo="github-git" module="scit2010/gimp-osx-theme"
+                       revision="master">
+               </branch>
+               <dependencies>
+                       <dep package="murrine-engine" />
+               </dependencies>
+       </autotools>
+
        <autotools id="murrine-engine" autogen-sh="configure">
                <branch module="murrine/0.98/murrine-0.98.2.tar.xz" version="0.98.2"
                        hash="sha256:e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89" />