Fix about dialog logo on OSX.

git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@5513 a436a847-0d15-0410-975c-d299462d15a1

4 files changed, 22 insertions, 3 deletions

diff --git a/osx/Info.plist.in b/osx/Info.plist.in
index a32c38d..0d8714b 100644
--- a/osx/Info.plist.in
+++ b/osx/Info.plist.in
@@ -34,6 +34,8 @@
 		<string>Resources</string>
 		<key>XDG_DATA_DIRS</key>
 		<string>Resources</string>
+		<key>GDK_PIXBUF_MODULE_FILE</key>
+		<string>Resources/loaders.cache</string>
 		<key>FONTCONFIG_FILE</key>
 		<string>Resources/fonts.conf</string>
 		<key>PANGO_RC_FILE</key>
diff --git a/osx/bundleify.sh b/osx/bundleify.sh
index 75bb030..102cf2a 100755
--- a/osx/bundleify.sh
+++ b/osx/bundleify.sh
@@ -23,6 +23,12 @@ mkdir -p "$bundle/Contents/lib/gtk-2.0/engines"
 cp $prefix/lib/gtk-2.0/2.10.0/engines/libquartz.so  $bundle/Contents/lib/gtk-2.0/engines
 cp $prefix/lib/pango/1.8.0/modules/*basic*.so $bundle/Contents/lib/modules
 
+# Copy GdkPixbuf loaders
+for fmt in icns png; do
+    cp $prefix/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-$fmt.so \
+       $bundle/Contents/lib/gdk-pixbuf-2.0/2.10.0/loaders/;
+done
+
 # Copy libraries depended on by the executable to bundle
 libs="`otool -L $exe | grep '\.dylib\|\.so' | grep '/User\|/opt/local\|/usr/local' | sed 's/(.*//'`"
 for l in $libs; do
@@ -30,13 +36,13 @@ for l in $libs; do
 done
 
 # Add libraries depended on by those libraries
-reclibs="`otool -L $bundle/Contents/lib/* $bundle/Contents/lib/gtk-2.0/engines/* $bundle/Contents/lib/modules/* | grep '\.dylib\|\.so' | grep \"$prefix\|/User\|/opt/local\|/usr/local\" | sed 's/(.*//'`"
+reclibs="`otool -L $bundle/Contents/lib/* $bundle/Contents/lib/gtk-2.0/engines/* $bundle/Contents/lib/modules/* $bundle/Contents/lib/gdk-pixbuf-2.0/2.10.0/loaders/* | grep '\.dylib\|\.so' | grep \"$prefix\|/User\|/opt/local\|/usr/local\" | sed 's/(.*//'`"
 for l in $reclibs; do
 	cp $l $bundle/Contents/lib
 done
 
 # ... and libraries depended on by those libraries (yes, this should be done more sanely)
-recreclibs="`otool -L $bundle/Contents/lib/* $bundle/Contents/lib/gtk-2.0/engines/* $bundle/Contents/lib/modules/* | grep '\.dylib\|\.so' | grep \"$prefix\|/User\|/opt/local\|/usr/local\" | sed 's/(.*//'`"
+recreclibs="`otool -L $bundle/Contents/lib/* $bundle/Contents/lib/gtk-2.0/engines/* $bundle/Contents/lib/modules/* $bundle/Contents/lib/gdk-pixbuf-2.0/2.10.0/loaders/* | grep '\.dylib\|\.so' | grep \"$prefix\|/User\|/opt/local\|/usr/local\" | sed 's/(.*//'`"
 for l in $recreclibs; do
 	cp $l $bundle/Contents/lib
 done
diff --git a/osx/loaders.cache b/osx/loaders.cache
new file mode 100644
index 0000000..19e9a29
--- /dev/null
+++ b/osx/loaders.cache
@@ -0,0 +1,11 @@
+"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so"
+"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"@executable_path/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so"
+"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
diff --git a/wscript b/wscript
index dd20921..eb36c76 100644
--- a/wscript
+++ b/wscript
@@ -187,7 +187,7 @@ def build(bld):
             target = out_base + 'Resources/Patchage.icns')
 
         # Gtk/Pango/etc configuration files
-        for i in ['pangorc', 'pango.modules', 'gtkrc']:
+        for i in ['pangorc', 'pango.modules', 'loaders.cache', 'gtkrc']:
             bld(rule   = 'cp ${SRC} ${TGT}',
                 source = 'osx/' + i,
                 target = out_base + 'Resources/' + i)