[gimp/gimp-2-8] OS X build README fixes * use cp to backup user's .profile file instead of mv * replace references t

[Sven Claussner <sclaussner src gnome org>]

commit d947baed9a525e7509dbd146b8d6265197234bb2
Author: Sven Claussner <sclaussner src gnome org>
Date:   Mon Sep 8 19:14:29 2014 +0200

    OS X build README fixes
    * use cp to backup user's .profile file instead of mv
    * replace references to osx-build branch by gimp-2-8 branch references
    * download patches
    * describe patch subdirectory

 build/osx/README |   70 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 43 insertions(+), 27 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index d262a38..6be1090 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -15,7 +15,7 @@ I. Preparations
 2. Backup "~/.profile" for a fresh start:
 $ if [ -f $HOME/.profile ]; \
    then \
-     mv $HOME/.profile $HOME/.profile-bak \
+     cp $HOME/.profile $HOME/.profile-bak \
     fi
 
 3. Get XCode for your OS X version from the App Store. 
@@ -80,14 +80,29 @@ $ make -j3 install
 $ exit
 and choose option '2' two times.
 
-5. Now you can build GIMP.
+5. Get the patches for the GIMP build:
+curl --create-dirs -o 
$HOME/gimp/directory/patches/gmi2-improve-internationalization-of-App-menu-and-other-s.patch 
https://git.gnome.org/browse/gimp/plain/build/osx/patches/gmi2-improve-internationalization-of-App-menu-and-other-s.patch?h=gimp-2-8
+curl -o $HOME/gimp/directory/patches/gmi2-keep-separators-between-placeholders.patch 
https://git.gnome.org/browse/gimp/plain/build/osx/patches/gmi2-keep-separators-between-placeholders.patch?h=gimp-2-8
+curl -o $HOME/gimp/directory/patches/gtk2-add-missing-information-to-po-translation-files.patch 
https://git.gnome.org/browse/gimp/plain/build/osx/patches/gtk2-add-missing-information-to-po-translation-files.patch?h=gimp-2-8
+curl -o $HOME/gimp/directory/patches/libffi-fix-wrong-variable-substitution-in-configure.patch 
https://git.gnome.org/browse/gimp/plain/build/osx/patches/libffi-fix-wrong-variable-substitution-in-configure.patch?h=gimp-2-8
+curl -o $HOME/gimp/directory/patches/libgcrypt-build-without-docs.patch 
https://git.gnome.org/browse/gimp/plain/build/osx/patches/libgcrypt-build-without-docs.patch?h=gimp-2-8
+curl -o $HOME/gimp/directory/patches/libsecret-fix-secret-dbus-generation.c.patch 
https://git.gnome.org/browse/gimp/plain/build/osx/patches/libsecret-fix-secret-dbus-generation.c.patch?h=gimp-2-8
+
+Check https://git.gnome.org/browse/gimp/tree/build/osx/patches?h=gimp-2-8:
+If there are less patches than listed above, then you don't need to try to
+download the missing patches.
+If there are more patches, then download them with the according commands as above.
+It's important that the first curl download contains the --create-dirs parameter
+to initially create the patches directory.
+
+6. Now you can build GIMP.
 For GIMP 2.8 enter
 $ JHB=gimp GIMP_SDK=10.6 jhbuild build gimp-2.8
 
 For GIMP master enter
 $ JHB=gimp GIMP_SDK=10.6 jhbuild build gimp-master
 
-6. In order to run GIMP with D-Bus support (required for GVFS and GIO)
+7. In order to run GIMP with D-Bus support (required for GVFS and GIO)
 $ dbus-launch gimp-2.8
 
 This will generate a D-Bus session. If you continuously run GIMP using this method, 
@@ -99,34 +114,34 @@ III. Create a GIMP installer
 1. To create a bundle, we need some more files:
 
 for GIMP 2.8:
-$ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp-2.8-python.bundle?h=osx-build &&
-  curl -o $HOME/gimp/directory/launcher-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-2.8-python.sh?h=osx-build &&
+$ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp-2.8-python.bundle?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/launcher-2.8-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-2.8-python.sh?h=gimp-2-8 &&
   chmod +x $HOME/gimp/directory/launcher-2.8-python.sh &&
-  curl -o $HOME/gimp/directory/info-2.8-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-2.8-python.plist?h=osx-build &&
-  curl -o $HOME/gimp/directory/gimp.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=osx-build &&
-  curl -o $HOME/gimp/directory/xcf.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=osx-build &&
-  curl --create-dirs -o $HOME/gimp/directory/custom/fonts.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/gimp.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/gimprc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/gtkrc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=osx-build
+  curl -o $HOME/gimp/directory/info-2.8-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-2.8-python.plist?h=gimp-2-8 &&
+  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
 
 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=osx-build &&
-  curl -o $HOME/gimp/directory/launcher-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-master-python.sh?h=osx-build &&
+$ 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 &&
   chmod +x $HOME/gimp/directory/launcher-master-python.sh &&
-  curl -o $HOME/gimp/directory/info-master-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-master-python.plist?h=osx-build &&
-  curl -o $HOME/gimp/directory/gimp.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=osx-build &&
-  curl -o $HOME/gimp/directory/xcf.icns 
https://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=osx-build &&
-  curl --create-dirs -o $HOME/gimp/directory/custom/fonts.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/gimp.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/gimprc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/gtkrc 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/open.desktop 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=osx-build &&
-  curl -o $HOME/gimp/directory/custom/session.conf 
https://git.gnome.org/browse/gimp/plain/build/osx/custom/session.conf?h=osx-build
+  curl -o $HOME/gimp/directory/info-master-python.plist 
https://git.gnome.org/browse/gimp/plain/build/osx/info-master-python.plist?h=gimp-2-8 &&
+  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
   
 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
@@ -155,4 +170,5 @@ gimp-master-python-bundle   configuration for gtk-mac-bundler (GIMP master)
 info-2.8-python.plist       OS X application metadata (GIMP 2.8)
 info-master-python.plist    OS X application metadata (GIMP master)
 launcher-python.sh          GIMP starter in the OS X application package
+patches                     Patches as long as their are not accepted upstream
 xcf.icns                    application icon