GNOME.org
 

[gimp/osx-build: 19/55] Split OS X launcher into 2.8 and master versions

commit ce28ce4ccf3aa749baef1733eaa01c5681b25cf1
Author: Sven Claussner <sclaussner src gnome org>
Date:   Sun May 11 15:41:44 2014 +0200

    Split OS X launcher into 2.8 and master versions
    
    GIMP launcher for GIMP 2.8 and master differ in the GEGL path. Otherwise
    GIMP master on OS X will not start due to unfound GEGL.

 build/osx/README                                   |    8 +++---
 build/osx/gimp-2.8-python.bundle                   |    2 +-
 build/osx/gimp-master-python.bundle                |   28 ++++++++++----------
 build/osx/info-2.8-python.plist                    |    2 +-
 build/osx/info-master-python.plist                 |    4 +-
 .../{launcher-python.sh => launcher-2.8-python.sh} |    0
 ...auncher-python.sh => launcher-master-python.sh} |    2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/build/osx/README b/build/osx/README
index a534aff..8690396 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -110,8 +110,8 @@ III. Create a GIMP installer
 
 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-python.sh?h=osx-build &&
-  chmod +x $HOME/gimp/directory/launcher-python.sh &&
+  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 &&
+  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 &&
@@ -125,8 +125,8 @@ $ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle https://git.gnome.org/brow
 
 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-python.sh?h=osx-build &&
-  chmod +x $HOME/gimp/directory/launcher-python.sh &&
+  curl -o $HOME/gimp/directory/launcher-python.sh 
https://git.gnome.org/browse/gimp/plain/build/osx/launcher-master-python.sh?h=osx-build &&
+  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 &&
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index 9cf34e7..ee21407 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -9,7 +9,7 @@
 
     <run-install-name-tool/>
 
-    <launcher-script>${project}/launcher-python.sh</launcher-script>
+    <launcher-script>${project}/launcher-2.8-python.sh</launcher-script>
 
     <gtk>gtk+-2.0</gtk>
   </meta>
diff --git a/build/osx/gimp-master-python.bundle b/build/osx/gimp-master-python.bundle
index 306f4f4..96ad010 100755
--- a/build/osx/gimp-master-python.bundle
+++ b/build/osx/gimp-master-python.bundle
@@ -9,7 +9,7 @@
 
     <run-install-name-tool/>
 
-    <launcher-script>${project}/launcher-python.sh</launcher-script>
+    <launcher-script>${project}/launcher-master-python.sh</launcher-script>
 
     <gtk>gtk+-2.0</gtk>
   </meta>
@@ -30,7 +30,7 @@
     ${prefix}/lib/libpyglib-2.0-python.0.dylib
   </binary>
 
-  <!-- Pull in all python modules -->
+  <!-- Pull in all Python modules -->
 
   <data>${prefix}/lib/pygtk/2.0/*.py</data>
   <data>${prefix}/lib/pygtk/2.0/demos/*.py</data>
@@ -72,7 +72,7 @@
   <data>${prefix}/lib/python2.7/xml/parsers/*.py</data>
   <data>${prefix}/lib/python2.7/xml/sax/*.py</data>
 
-  <!-- Pull in all python binaries -->
+  <!-- Pull in all Python binaries -->
 
   <binary>${prefix}/lib/python2.7/lib-dynload/*.so</binary>
   <binary>${prefix}/lib/python2.7/site-packages/*.so</binary>
@@ -88,7 +88,7 @@
 
   <main-binary>${prefix}/bin/gimp-2.9</main-binary>
 
-  <!-- Copy in gimp plugins and modules -->
+  <!-- Copy in GIMP plugins and modules -->
   <binary>${prefix}/lib/gimp/2.0/plug-ins/*</binary>
   <binary>${prefix}/lib/gimp/2.0/modules/*.so</binary>
   <data>${prefix}/lib/gimp/2.0/python/*py</data>
@@ -97,10 +97,10 @@
   <!-- Copy in GTK+ modules -->
   <binary>${prefix}/lib/${gtkdir}/modules/*.so</binary>
 
-  <!-- Copy in babl modules -->
+  <!-- Copy in Babl modules -->
   <binary>${prefix}/lib/babl-0.1/*.so</binary>
 
-  <!-- Copy in gegl modules -->
+  <!-- Copy in GEGL modules -->
   <binary>${prefix}/lib/gegl-0.3/*.so</binary>
 
   <!-- Copy in GTK+ theming engines and modules -->
@@ -108,7 +108,7 @@
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so</binary>
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so</binary>
 
-  <!-- Copy in gdk-pifbuf modules and loader file-->
+  <!-- Copy in GDK-Pixbuf modules and loader file-->
   <binary>
     ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/
   </binary>
@@ -148,7 +148,7 @@
     ${prefix}/share/mime-info/*
   </data>-->
 
-  <!-- Copy in dbus Launch session support -->
+  <!-- Copy in D-Bus Launch session support -->
   <data>${prefix}/etc/dbus-1/system.conf</data>
   <data>${prefix}/etc/dbus-1/session.d/</data>
   <data>${prefix}/etc/dbus-1/system.d/</data>
@@ -158,17 +158,17 @@
   <!--<binary>${prefix}/bin/dbus-</binary>-->
   <binary>${prefix}/bin/dbus-*</binary>
 
-  <!-- Copy in gvfs file support -->
+  <!-- Copy in GVFS file support -->
   <binary>${prefix}/bin/gvfs-*</binary>
 
-  <!-- Copy in gtk+-2.0 data -->
+  <!-- Copy in GTK+-2.0 data -->
   <data>${prefix}/etc/gtk-2.0/*</data>
 
-  <!-- Copy in fontconfig data -->
+  <!-- Copy in FontConfig data -->
   <data>${prefix}/etc/fonts/conf.d/*</data>
   <data>${prefix}/etc/fonts/fonts.conf</data>
 
-  <!-- Gimp data -->
+  <!-- GIMP data -->
   <data>${prefix}/etc/gimp/2.0/*</data>
   <data dest="${bundle}/Contents/Resources/share/gimp">${prefix}/share/gimp</data>
 
@@ -178,7 +178,7 @@
   <!-- Copy in themes -->
   <data>${prefix}/share/themes</data>
 
-  <!-- Copy in gtk+ theme data -->
+  <!-- Copy in GTK+ theme data -->
   <!-- data>${prefix}/share/gtk-engines/*.xml</data -->
 
   <!-- Change default theme -->
@@ -191,7 +191,7 @@
     ${project}/custom/gimprc
   </data>-->
 
-  <!-- Copy in better fontconfig defaults -->
+  <!-- Copy in better FontConfig defaults -->
   <!--<data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf">
     ${project}/custom/fonts.conf
   </data>-->
diff --git a/build/osx/info-2.8-python.plist b/build/osx/info-2.8-python.plist
index 62c2e97..21658ea 100644
--- a/build/osx/info-2.8-python.plist
+++ b/build/osx/info-2.8-python.plist
@@ -9,7 +9,7 @@
        <key>CFBundleName</key>
        <string>GIMP</string>
        <key>CFBundleGetInfoString</key>
-       <string>2.8, © 1995-2013 The GIMP Development Team</string>
+       <string>2.8, © 1995-2014 The GIMP Development Team</string>
        <key>CFBundleIconFile</key>
        <string>gimp.icns</string>
        <key>CFBundleIdentifier</key>
diff --git a/build/osx/info-master-python.plist b/build/osx/info-master-python.plist
old mode 100755
new mode 100644
index f5d15c4..317d7aa
--- a/build/osx/info-master-python.plist
+++ b/build/osx/info-master-python.plist
@@ -7,9 +7,9 @@
        <key>CFBundleExecutable</key>
        <string>GIMP</string>
        <key>CFBundleName</key>
-       <string>GIMP</string>
+       <string>GIMP Development Version</string>
        <key>CFBundleGetInfoString</key>
-       <string>2.9, © 1995-2013 The GIMP Development Team</string>
+       <string>2.9, © 1995-2014 The GIMP Development Team</string>
        <key>CFBundleIconFile</key>
        <string>gimp.icns</string>
        <key>CFBundleIdentifier</key>
diff --git a/build/osx/launcher-python.sh b/build/osx/launcher-2.8-python.sh
similarity index 100%
copy from build/osx/launcher-python.sh
copy to build/osx/launcher-2.8-python.sh
diff --git a/build/osx/launcher-python.sh b/build/osx/launcher-master-python.sh
similarity index 98%
rename from build/osx/launcher-python.sh
rename to build/osx/launcher-master-python.sh
index f3cee9a..1b37e4e 100755
--- a/build/osx/launcher-python.sh
+++ b/build/osx/launcher-master-python.sh
@@ -51,7 +51,7 @@ export PANGO_LIBDIR="$bundle_lib"
 export FONTCONFIG_FILE="$bundle_etc/fonts/fonts.conf"
 
 # Include GEGL path
-export GEGL_PATH="$bundle_lib/gegl-0.2"
+export GEGL_PATH="$bundle_lib/gegl-0.3"
 
 # Set up Python
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]