[gimp/gimp-2-8] osx: Update build files, prep for 2.8.8 dmg

From: Clayton Walker <claytonw src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp/gimp-2-8] osx: Update build files, prep for 2.8.8 dmg
Date: Mon, 18 Nov 2013 00:37:46 +0000 (UTC)
commit 43f7961c1798efa067f9a33aacea94ba96bf4ad6
Author: Clayton Walker <clayton m walker gmail com>
Date:   Sun Nov 17 17:37:17 2013 -0700

    osx: Update build files, prep for 2.8.8 dmg

 build/osx/gimp-2.8-python.bundle |   39 +++++++++----
 build/osx/gimp.modules           |  110 +++++++++++++++++++++++++++++--------
 build/osx/launcher-2.8-python.sh |   45 +++++++++++-----
 3 files changed, 145 insertions(+), 49 deletions(-)
---
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index 4e27236..07100b9 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -15,7 +15,7 @@
   </meta>
 
   <!-- Copy in .plist file -->
-  <plist>${project}/info-2.8-python.plist</plist>
+  <plist>${project}/info-2.8.8-python.plist</plist>
 
   <binary>
     ${prefix}/lib/libgtk-quartz-${gtkversion}.0.dylib
@@ -108,9 +108,14 @@
   <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 all gdk-pifbuf modules -->
+  <!-- Copy in gdk-pifbuf modules and loader file-->
   <binary>
-    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/
+  </binary>
+
+  <!-- Copy in pango modules -->
+  <binary>
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
   </binary>
 
   <!-- Translation filenames-->
@@ -118,16 +123,24 @@
 
   <!-- Copy in mime data -->
   <!-- Used for opening up help in browser -->
-  <data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
+  <!--<data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
     ${project}/custom/gimp.desktop
-  </data>
-  <data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
+  </data>-->
+  <data>${prefix}/share/applications/gimp.desktop</data>
+  <data dest="${bundle}/Contents/Resources/share/applications/open.desktop">
     ${project}/custom/open.desktop
   </data>
-  <data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
+  <data dest="${bundle}/Contents/Resources/share/applications/mimeinfo.cache">
     ${project}/custom/mimeinfo.cache
   </data>
 
+  <data>
+    ${prefix}/share/mime/*
+  </data>
+ <!--<data>
+    ${prefix}/share/mime-info/*
+  </data>-->
+
   <!-- Copy in dbus Launch session support -->
   <data>${prefix}/etc/dbus-1/system.conf</data>
   <data>${prefix}/etc/dbus-1/session.d/</data>
@@ -135,7 +148,8 @@
   <data dest="${bundle}/Contents/Resources/etc/dbus-1/session.conf">
     ${project}/custom/session.conf
   </data>
-  <binary>${prefix}/bin/dbus-launch</binary>
+  <!--<binary>${prefix}/bin/dbus-</binary>-->
+  <binary>${prefix}/bin/dbus-*</binary>
 
   <!-- Copy in gvfs file support -->
   <binary>${prefix}/bin/gvfs-*</binary>
@@ -145,6 +159,7 @@
 
   <!-- Copy in fontconfig data -->
   <data>${prefix}/etc/fonts/conf.d/*</data>
+  <data>${prefix}/etc/fonts/fonts.conf</data>
 
   <!-- Gimp data -->
   <data>${prefix}/etc/gimp/2.0/*</data>
@@ -165,14 +180,14 @@
   </data>
 
   <!-- Copy in better defaults -->
-  <data dest="${bundle}/Contents/Resources/etc/gimp/2.0/gimprc">
+  <!--<data dest="${bundle}/Contents/Resources/etc/gimp/2.0/gimprc">
     ${project}/custom/gimprc
-  </data>
+  </data>-->
 
   <!-- Copy in better fontconfig defaults -->
-  <data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf">
+  <!--<data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf">
     ${project}/custom/fonts.conf
-  </data>
+  </data>-->
 
   <!-- Copy in icons -->
   <data dest="${bundle}/Contents/Resources">${project}/gimp.icns</data>
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index bbe881b..6672243 100644
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -18,6 +18,8 @@
              href="http://ftp.gnome.org/pub/gnome/sources/"/>
   <repository type="tarball" name="ftp.gnu.org"
               href="ftp://ftp.gnu.org/gnu/"/>
+  <repository type="tarball" name="gnupg"
+              href="ftp://ftp.gnupg.org/"/>
   <repository type="tarball" name="intltool"
               href="http://launchpad.net/intltool/trunk/"/>
   <repository type="tarball" name="fontconfig"
@@ -35,7 +37,7 @@
   <repository type="tarball" name="ftp.gtk.org" 
              href="ftp://ftp.gtk.org/pub/"/>
   <repository type="tarball" name="gimp"
-              href="ftp://ftp.gimp.org/pub/gimp/"/>
+              href="ftp://ftp.gimp.org/pub/"/>
   <repository type="tarball" name="umfpack"
               href="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"/>
   <repository type="tarball" name="tango.freedesktop.org"
@@ -65,12 +67,12 @@
               href="http://www.lysator.liu.se/~nisse/archive/"/>
   <repository type="tarball" name="gmp"
               href="http://mirror.anl.gov/pub/gnu/gmp/"/>
-
   <repository type="tarball" name="libproxy"
               href="http://mirrors.vbi.vt.edu/mirrors/linux/slackware/slackware-current/source/l/libproxy/"/>
-
   <repository type="tarball" name="nasm"
               href="http://www.nasm.us/pub/nasm/releasebuilds/"/>
+  <repository type="tarball" name="curl"
+              href="http://curl.haxx.se/download/"/>
 
   <repository type="tarball" name="sqlite"
               href="http://www.sqlite.org/2013/"/>
@@ -192,10 +194,10 @@
 
   <autotools id="fontconfig"
              autogen-sh="configure"
-            autogenargs="--disable-docs">
+            autogenargs="--disable-docs 
--with-add-fonts=~/Library/Fonts,/Library/Fonts,/System/Library/Fonts">
     <branch repo="fontconfig"
-            version="2.10.95"
-            module="fontconfig-2.10.95.tar.bz2"/>
+            version="2.11.0"
+            module="fontconfig-2.11.0.tar.bz2"/>
     <dependencies>
       <dep package="freetype"/>
       <dep package="libxml2"/>
@@ -501,7 +503,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gdk-pixbuf" autogen-sh="configure" autogenargs="">
+<!-- with-included-loaders=yes disable-modules enable-gio-sniffing=no -->
+
+  <autotools id="gdk-pixbuf"
+            autogen-sh="configure"
+            autogenargs="">
     <branch module="gdk-pixbuf/2.30/gdk-pixbuf-2.30.1.tar.xz"
             version="2.30.1"
             hash="sha256:a3263b1e15668c009313bf04ab67420bec9f2b167c402a71a486307cadee8d30"/>
@@ -558,9 +564,9 @@
   </autotools>
 
   <autotools id="libsecret" autogen-sh="configure" autogenargs="">
-    <branch module="libsecret/0.15/libsecret-0.15.tar.xz"
-            version="0.15.0"
-            hash="sha256:33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8"/>
+    <branch module="libsecret/0.16/libsecret-0.16.tar.xz"
+            version="0.16.0"
+            hash="sha256:b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218"/>
     <dependencies>
       <dep package="sqlite"/>
       <dep package="gobject-introspection"/>
@@ -584,9 +590,9 @@
 
   <autotools id="gnutls"
              autogen-sh="configure"
-             autogenargs="">
-    <branch module="gnutls/v3.2/gnutls-3.2.2.tar.xz"
-            version="3.2.2"
+             autogenargs="--disable-cxx">
+    <branch module="gnutls/v3.2/gnutls-3.2.6.tar.xz"
+            version="3.2.6"
             repo="gnutls"/>
     <dependencies>
       <dep package="nettle"/>
@@ -594,22 +600,32 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libgcrypt"
+  <autotools id="curl"
+             autogen-sh="configure"
+             autogenargs="">
+    <branch module="curl-7.33.0.tar.gz"
+            version="7.33.0"
+            repo="curl"/>
+    <dependencies>
+      <dep package="gnutls"/>
+    </dependencies>
+  </autotools>
+
+<autotools id="libgcrypt"
              autogen-sh="configure"
-             autogenargs="--disable-asm">
-    <branch module="libgcrypt/libgcrypt-1.5.3.tar.bz2"
+             autogenargs="">
+    <branch module="gcrypt/libgcrypt/libgcrypt-1.5.3.tar.gz"
             version="1.5.3"
-            repo="gnutls"/>
+            repo="gnupg"/>
     <dependencies>
-      <dep package="libgpg-error"/>
     </dependencies>
   </autotools>
 
   <autotools id="libgpg-error"
              autogen-sh="configure"
              autogenargs="">
-    <branch module="libgpg-error/libgpg-error-1.11.tar.bz2"
-            version="1.11"
+    <branch module="libgpg-error/libgpg-error-1.12.tar.bz2"
+            version="1.12"
             repo="gnutls"/>
     <dependencies>
     </dependencies>
@@ -623,6 +639,18 @@
             repo="nettle"/>
     <dependencies>
       <dep package="gmp5"/>
+      <dep package="openssl"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="openssl"
+             autogen-sh="Configure"
+             autogenargs="--prefix=/Users/claytonwalker/gimp/10.9/inst zlib no-krb5 shared 
darwin64-x86_64-cc">
+    <branch module="openssl-1.0.1e.tar.gz"
+            version="1.0.1e"
+            repo="openssl"/>
+    <dependencies>
+      <dep package="zlib"/>
     </dependencies>
   </autotools>
 
@@ -804,8 +832,8 @@
   <autotools id="dbus"
              autogen-sh="configure"
              autogenargs="--disable-doxygen-docs --disable-xml-docs --disable-selinux --without-x 
--disable-tests --enable-verbose-mode --enable-asserts">
-    <branch module="dbus/dbus-1.7.4.tar.gz"
-            version="1.7.4"
+    <branch module="dbus/dbus-1.7.8.tar.gz"
+            version="1.7.8"
             repo="dbus">
     </branch>
     <dependencies>
@@ -866,9 +894,11 @@
 
   <!-- Python enabled gimp -->
 
-  <autotools id="gimp-2.8"
+  <!-- with-dbus -->
+
+<autotools id="gimp-2.8"
              autogen-sh="autogen.sh"
-             autogenargs="--without-x --enable-gtk-doc=no --with-dbus --without-wmf --enable-binreloc 
--without-gs"
+             autogenargs="--without-x --enable-gtk-doc=no --without-gvfs --without-dbus --without-wmf 
--enable-binreloc --without-gs"
              skip-autogen="never">
     <branch repo="git.gnome.org"
             module="gimp"
@@ -893,6 +923,38 @@
       <dep package="meta-gtk-osx-python"/>
       <dep package="tango-icon-theme"/>
       <dep package="gvfs"/>
+      <dep package="curl"/>
+      <dep package="gtk-mac-integration-python2"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gimp-2.8.8"
+             autogen-sh="configure"
+             autogenargs="--without-x --enable-gtk-doc=no --without-gvfs --without-dbus --without-wmf 
--enable-binreloc --without-gs">
+    <branch module="gimp/v2.8/gimp-2.8.8.tar.bz2"
+           repo="gimp"
+           hash="md5:ef2547c3514a1096931637bd6250635a"
+            version="2.8.8"/>
+    <dependencies>
+      <dep package="libpng"/>
+      <dep package="libjpeg"/>
+      <dep package="libtiff"/>
+      <dep package="exif"/>
+      <dep package="dbus"/>
+      <dep package="dbus-glib"/>
+      <dep package="librsvg"/>
+      <dep package="lcms"/>
+      <dep package="fontconfig"/>
+      <dep package="gegl-0.2"/>
+      <dep package="glib"/>
+      <dep package="gtk+-2.24"/>
+      <dep package="poppler"/>
+      <dep package="iso-codes"/>
+      <dep package="jasper"/>
+      <dep package="meta-gtk-osx-python"/>
+      <dep package="tango-icon-theme"/>
+      <dep package="gvfs"/>
+      <dep package="curl"/>
       <dep package="gtk-mac-integration-python2"/>
     </dependencies>
   </autotools>
diff --git a/build/osx/launcher-2.8-python.sh b/build/osx/launcher-2.8-python.sh
index 6a04a4e..c5e1089 100755
--- a/build/osx/launcher-2.8-python.sh
+++ b/build/osx/launcher-2.8-python.sh
@@ -1,13 +1,15 @@
 #!/bin/sh
 
+echo "Setting up environment..."
+
 if test "x$GTK_DEBUG_LAUNCHER" != x; then
-set -x
+    set -x
 fi
 
 if test "x$GTK_DEBUG_GDB" != x; then
-EXEC="gdb --args"
+    EXEC="gdb --args"
 else
-EXEC=exec
+    EXEC=exec
 fi
 
 name=`basename "$0"`
@@ -36,7 +38,12 @@ export PATH="$bundle_contents/MacOS:$bundle_bin:$PATH"
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
 export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export GDK_PIXBUF_MODULEDIR="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders"
+#export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+
 export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
 
 # Specify fonconfig configuration file
 export FONTCONFIG_FILE="$bundle_etc/fonts/fonts.conf"
@@ -44,6 +51,8 @@ export FONTCONFIG_FILE="$bundle_etc/fonts/fonts.conf"
 # Include gegl path
 export GEGL_PATH="$bundle_lib/gegl-0.2"
 
+echo "Enabling internal python..."
+
 # Set up python
 export PYTHONHOME="$bundle_res"
 # Add bundled python modules
@@ -55,20 +64,22 @@ PYTHONPATH="$bundle_lib/pygtk/2.0:$PYTHONPATH"
 PYTHONPATH="$bundle_lib/gimp/2.0/python:$PYTHONPATH"
 export PYTHONPATH
 
+#echo "Activating dbus..."
+
 # Launch dbus if needed
-dbusenv="$TMPDIR/gimp-$USER.dbus"
+#dbusenv="$TMPDIR/gimp-$USER.dbus"
 
-if [ -f "$dbusenv" ]; then
-    source "$dbusenv"
-fi
+#if [ -f "$dbusenv" ]; then
+#    source "$dbusenv"
+#fi
 
-if [ -z "$DBUS_SESSION_BUS_PID" ] || ! ps -p "$DBUS_SESSION_BUS_PID" >/dev/null; then
-    "$bundle_bin/dbus-launch" --config-file "$bundle_etc/dbus-1/session.conf" > "$dbusenv"
-    source "$dbusenv"
-fi
+#if [ -z "$DBUS_SESSION_BUS_PID" ] || ! ps -p "$DBUS_SESSION_BUS_PID" >/dev/null; then
+#    "$bundle_bin/dbus-launch" --config-file "$bundle_etc/dbus-1/session.conf" > "$dbusenv"
+#    source "$dbusenv"
+#fi
 
-export DBUS_SESSION_BUS_PID
-export DBUS_SESSION_BUS_ADDRESS
+#export DBUS_SESSION_BUS_PID
+#export DBUS_SESSION_BUS_ADDRESS
 
 # Specify ghostscript directories
 # export GS_RESOURCE_DIR="$bundle_res/share/ghostscript/9.06/Resource"
@@ -76,6 +87,8 @@ export DBUS_SESSION_BUS_ADDRESS
 # export 
GS_LIB="$GS_RESOURCE_DIR/Init:$GS_RESOURCE_DIR:$GS_RESOURCE_DIR/Font:$bundle_res/share/ghostscript/fonts:$bundle_res/share/fonts/urw-fonts:$GS_ICC_PROFILES"
 # export 
GS_FONTPATH="$bundle_res/share/ghostscript/fonts:$bundle_res/share/fonts/urw-fonts:~/Library/Fonts:/Library/Fonts:/System/Library/Fonts"
 
+echo "Locale black magic..."
+
 APP=name
 I18NDIR="$bundle_data/locale"
 # Set the locale-related variables appropriately:
@@ -208,4 +221,10 @@ if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
 shift 1
 fi
 
+echo "Launching GIMP..."
 $EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS
+
+#"$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS
+
+#echo "Cleaning up..."
+#killall dbus-daemon
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]