[gimp/gimp-2-8] build/osx: remove gimp.desktop from custom directory

[Kristian Rietveld <kristian src gnome org>]

commit e039a5374acd44b1b6274fc8c4357c149a789915
Author: Kristian Rietveld <kris loopnest org>
Date:   Thu Apr 20 22:50:33 2017 +0200

    build/osx: remove gimp.desktop from custom directory
    
    We should simply by using the .desktop file that is generated during
    the build.

 build/osx/README                    |    9 ++-
 build/osx/custom/gimp.desktop       |  202 -----------------------------------
 build/osx/gimp-2.8-python.bundle    |    2 +-
 build/osx/gimp-master-python.bundle |    2 +-
 4 files changed, 9 insertions(+), 206 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index 96764aa..f211e15 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -120,13 +120,15 @@ $ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle https://git.gnome.org/brow
   curl -o $HOME/gimp/directory/gimp.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/xcf.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=gimp-2-8 &&
   curl --create-dirs -o $HOME/gimp/directory/custom/fonts.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=gimp-2-8 &&
-  curl -o $HOME/gimp/directory/custom/gimp.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/gimprc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/gtkrc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=gimp-2-8
 
+$ cp -p $HOME/gimp/10.6/source/gimp-2.8/desktop/gimp.desktop $HOME/gimp/directory/gimp.desktop
+
+
 for GIMP master:
 $ curl -o $HOME/gimp/directory/gimp-master-python.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp-master-python.bundle?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/launcher-master-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-master-python.sh?h=gimp-2-8 &&
@@ -141,7 +143,10 @@ $ curl -o $HOME/gimp/directory/gimp-master-python.bundle https://git.gnome.org/b
   curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=gimp-2-8 &&
   curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=gimp-2-8
-  
+
+$ cp -p $HOME/gimp/10.6/source/gimp-2.8/desktop/gimp.desktop $HOME/gimp/directory/gimp.desktop
+
+
 2. We also need to fix a few outstanding issues:
 $ cp $HOME/gimp/10.6/source/gettext-0.18.1.1/gettext-tools/intl/charset.alias ~/gimp/10.6/inst/lib
 $ chmod +w $HOME/gimp/10.6/inst/lib/libpython2.7.dylib
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index 7715631..6fb66e5 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -158,7 +158,7 @@
 
        <!-- Used for opening up help in browser -->
        <!--<data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop"> 
-               ${project}/custom/gimp.desktop </data> -->
+               ${project}/gimp.desktop </data> -->
        <data>${prefix}/share/applications/gimp.desktop</data>
        <data dest="${bundle}/Contents/Resources/share/applications/open.desktop">
                ${project}/custom/open.desktop
diff --git a/build/osx/gimp-master-python.bundle b/build/osx/gimp-master-python.bundle
index ad89d00..b3d4a74 100644
--- a/build/osx/gimp-master-python.bundle
+++ b/build/osx/gimp-master-python.bundle
@@ -166,7 +166,7 @@
        <!-- Copy in mime data -->
        <!-- Used for opening up help in browser -->
        <!--<data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop"> 
-               ${project}/custom/gimp.desktop </data> -->
+               ${project}/gimp.desktop </data> -->
        <data>${prefix}/share/applications/gimp.desktop</data>
        <data dest="${bundle}/Contents/Resources/share/applications/open.desktop">
                ${project}/custom/open.desktop