[gtk-mac-bundler] Fix pixbuf loader cache path

[John Ralls <jralls src gnome org>]

commit 07dc3ae5f22a51f37759f43b83a43dcbbadb3806
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Mon Aug 25 15:47:48 2014 +0200

    Fix pixbuf loader cache path

 bundler/bundler.py |   27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/bundler/bundler.py b/bundler/bundler.py
index 8db5e13..50433b4 100644
--- a/bundler/bundler.py
+++ b/bundler/bundler.py
@@ -161,6 +161,7 @@ class Bundler:
 
     def create_gdk_pixbuf_loaders_setup(self):
         modulespath = ""
+        cachepath = ""
         if os.path.exists(os.path.join(self.project.get_prefix(), "lib", 
                                        "gdk-pixbuf-2.0")):
 
@@ -168,25 +169,37 @@ class Bundler:
                                                      "gdk-pixbuf-2.0", 
                                                      "${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}",
                                                      "loaders")
+            cachepath = self.project.get_bundle_path("Contents/Resources/lib/",
+                                                     "gdk-pixbuf-2.0",
+                                                     "${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}",
+                                                     "loaders.cache")
         elif os.path.exists(os.path.join(self.project.get_prefix(), "lib", 
                                        "gdk-pixbuf-3.0")):
             modulespath = self.project.get_bundle_path("Contents/Resources/lib/",
                                                      "gdk-pixbuf-3.0", 
                                                      "${pkg:gdk-pixbuf-3.0:gdk_pixbuf_binary_version}",
                                                      "loaders")
+            cachepath = self.project.get_bundle_path("Contents/Resources/lib/",
+                                                     "gdk-pixbuf-3.0",
+                                                     "${pkg:gdk-pixbuf-3.0:gdk_pixbuf_binary_version}",
+                                                     "loaders.cache")
         else:
             modulespath = self.project.get_bundle_path("Contents/Resources/lib/",
-                                                   self.project.get_gtk_dir(),
-                                                   "${pkg:" + self.meta.gtk + ":gtk_binary_version}",
-                                                   "loaders")
+                                                       self.project.get_gtk_dir(),
+                                                       "${pkg:" + self.meta.gtk + ":gtk_binary_version}",
+                                                       "loaders")
+            cachepath = self.project.get_bundle_path("Contents/Resources/etc/",
+                                                     self.project.get_gtk_dir(),
+                                                     "gdk-pixbuf.loaders")
+
         modulespath = utils.evaluate_pkgconfig_variables (modulespath)
+        cachepath = utils.evaluate_pkgconfig_variables (cachepath)
+
         cmd = "GDK_PIXBUF_MODULEDIR=" + modulespath + " gdk-pixbuf-query-loaders"
         f = os.popen(cmd)
 
-        path = self.project.get_bundle_path("Contents/Resources/etc/", 
-                                            self.project.get_gtk_dir())
-        utils.makedirs(path)
-        fout = open(os.path.join(path, "gdk-pixbuf.loaders"), "w")
+        utils.makedirs(os.path.dirname(cachepath))
+        fout = open(cachepath, "w")
 
         prefix = "\"" + self.project.get_bundle_path("Contents/Resources")
         for line in f: