From f3b9a37fb2e853717723ca98d07101201a328518 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 2 Oct 2012 12:13:19 -0700
Subject: [PATCH] More fixes to MacOS bundle file and README

This still seems to fail to open the icon in the About screen in some
cases, but we don't quite understand why...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/macosx/README            | 6 ++++++
 packaging/macosx/subsurface.bundle | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packaging/macosx/README b/packaging/macosx/README
index d83cc0f31..88a383db9 100644
--- a/packaging/macosx/README
+++ b/packaging/macosx/README
@@ -13,4 +13,10 @@ sudo port install pango +builtin_modules +no_x11 +quartz
 
 Without the builtin modules the installed application fails to find the modules and doesn't render any text.
 
+Also, it seems that gtk-mac-bundler expects the charset.alias file to be
+in the ${prefix}/lib folder which it isn't with the current version of
+MacPorts. The following fixes that:
+
+sudo cp /usr/lib/charset.alias /opt/local/lib
+
 
diff --git a/packaging/macosx/subsurface.bundle b/packaging/macosx/subsurface.bundle
index 8544e77a2..fcfd4f7f1 100644
--- a/packaging/macosx/subsurface.bundle
+++ b/packaging/macosx/subsurface.bundle
@@ -74,9 +74,9 @@
   </binary>
 
 <!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
-  <binary>
-    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
-  </binary>
+  <data>
+    ${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+  </data>
 
   <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
@@ -116,7 +116,7 @@
        change the source path. -->
 
   <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
-    ${project}/gtkrc
+    ${prefix}/share/themes/Mac/gtk-2.0-key/gtkrc
   </data>
 
   <!-- Icon themes to copy. The "icons" property can be either of