[dia] [gtk-osx] Update installer/macos for non-X build

[Hans Breuer <hans src gnome org>]

commit 822afc413092e42ced8b30825c2bc0eae3f43986
Author: Hans Breuer <hans breuer org>
Date:   Fri Sep 19 18:59:38 2014 +0200

    [gtk-osx] Update installer/macos for non-X build
    
     - remove now unsupported --integrated command line switch
     - update the icon to be closer to the other platforms
       application icons
     - change osx-app.sh for backend releated file changes

 installer/macosx/Resources/Dia.icns |  Bin 103759 -> 301092 bytes
 installer/macosx/dia                |    2 +-
 installer/macosx/osx-app.sh         |    4 +---
 3 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/installer/macosx/Resources/Dia.icns b/installer/macosx/Resources/Dia.icns
index b6fdb95..495b21a 100644
Binary files a/installer/macosx/Resources/Dia.icns and b/installer/macosx/Resources/Dia.icns differ
diff --git a/installer/macosx/dia b/installer/macosx/dia
index 384876f..97fb4eb 100755
--- a/installer/macosx/dia
+++ b/installer/macosx/dia
@@ -115,4 +115,4 @@ sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \
 sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \
     > "${HOME}/.dia-etc/gdk-pixbuf.loaders"
 
-exec "$CWD/dia-bin" --integrated
+exec "$CWD/dia-bin"
diff --git a/installer/macosx/osx-app.sh b/installer/macosx/osx-app.sh
index 96105ae..0c97b78 100644
--- a/installer/macosx/osx-app.sh
+++ b/installer/macosx/osx-app.sh
@@ -225,20 +225,18 @@ echo "APPL????" > $package/Contents/PkgInfo
 # Pull in extra requirements for Pango and GTK
 pkgetc="$package/Contents/Resources/etc"
 mkdir -p $pkgetc/pango
-cp $binary_dir/../etc/pango/pangox.aliases $pkgetc/pango/
 # Need to adjust path and quote in case of spaces in path.
 sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $binary_dir/../etc/pango/pango.modules > 
$pkgetc/pango/pango.modules
 
 cat > $pkgetc/pango/pangorc <<END_PANGO
 [Pango]
 ModuleFiles=\${HOME}/.dia-etc/pango.modules
-[PangoX]
-AliasFiles=\${HOME}/.dia-etc/pangox.aliases
 END_PANGO
 
 # We use a modified fonts.conf file so only need the dtd
 mkdir -p $pkgetc/fonts
 cp $binary_dir/../etc/fonts/fonts.dtd $pkgetc/fonts/
+cp $binary_dir/../etc/fonts/fonts.conf $pkgetc/fonts/
 cp -r $binary_dir/../etc/fonts/conf.avail $pkgetc/fonts/
 cp -r $binary_dir/../etc/fonts/conf.d $pkgetc/fonts/