[gimp/gimp-2-8] build: update OSX build files.

From: Michael Natterer <mitch src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp/gimp-2-8] build: update OSX build files.
Date: Wed, 29 Aug 2012 23:30:43 +0000 (UTC)
commit 06439dea64631caf31e8683a2d8a8ab2934bbbc3
Author: Clayton Walker <blender3dartist gmail com>
Date:   Wed Aug 29 17:02:03 2012 -0600

    build: update OSX build files.
    
    Include fonts.conf with sane defaults. Include gimprc and gtkrc for
    sane defaults. Update launcher script to fix first time startup crash
    and cage tool crash. Update gimp-python.bundle to properly rename
    paths in linked libraries. Update gimp.modules to include svg support.

 build/osx/fonts.conf         |  155 ++++++++++++++++++++++++++++++++++++++++++
 build/osx/gimp-python.bundle |   45 +++++++------
 build/osx/gimp.modules       |   31 ++++++---
 build/osx/gimprc             |    3 +
 build/osx/gtkrc              |    1 -
 build/osx/launcher-python.sh |   15 +++-
 6 files changed, 216 insertions(+), 34 deletions(-)
---
diff --git a/build/osx/fonts.conf b/build/osx/fonts.conf
new file mode 100644
index 0000000..50f1868
--- /dev/null
+++ b/build/osx/fonts.conf
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+	DO NOT EDIT THIS FILE.
+	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+	LOCAL CHANGES BELONG IN 'local.conf'.
+
+	The intent of this standard configuration file is to be adequate for
+	most environments.  If you have a reasonably normal environment and
+	have found problems with this configuration, they are probably
+	things that others will also want fixed.  Please submit any
+	problems to the fontconfig bugzilla system located at fontconfig.org
+
+	Note that the normal 'make install' procedure for fontconfig is to
+	replace any existing fonts.conf file with the new version.  Place
+	any local customizations in local.conf which this file references.
+
+	Keith Packard
+-->
+
+<!-- Font directory list -->
+
+	<dir>/usr/share/fonts</dir>
+	<dir>/usr/X11R6/lib/X11/fonts</dir>
+        <dir>/opt/local/share/fonts</dir>
+	<dir>/Library/Fonts</dir>
+        <dir>/Network/Library/Fonts</dir>
+        <dir>/System/Library/Fonts</dir>
+	<dir>~/Library/Fonts</dir>
+	<dir>~/.fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Load local system customization file
+-->
+	<include ignore_missing="yes">conf.d</include>
+
+<!-- Font cache directory list -->
+
+	<cachedir>~/Library/Caches/org.freedesktop.fontconig</cachedir>
+
+	<config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
+			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
+			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
+			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
+			<int>0x3164</int>	<!-- HANGUL FILLER -->
+			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
diff --git a/build/osx/gimp-python.bundle b/build/osx/gimp-python.bundle
index 960546d..c183d17 100644
--- a/build/osx/gimp-python.bundle
+++ b/build/osx/gimp-python.bundle
@@ -86,6 +86,15 @@
   <!-- Name of main gimp binary -->
   <main-binary>${prefix}/bin/gimp</main-binary>
 
+  <!-- Copy in gimp plugins -->
+  <binary>${prefix}/lib/gimp/2.0/plug-ins/*</binary>
+
+  <!-- Copy in gimp modules -->
+  <binary>${prefix}/lib/gimp/2.0/modules/*.so</binary>
+
+  <!-- Copy in gimp python modules -->
+  <binary>${prefix}/lib/gimp/2.0/python/*</binary>
+
   <!-- Copy in GTK+ modules -->
   <binary>${prefix}/lib/${gtkdir}/modules/*.so</binary>
 
@@ -95,13 +104,13 @@
   <!-- Copy in gegl modules -->
   <binary>${prefix}/lib/gegl-0.2/*.so</binary>
 
-  <!-- Copy in GTK+ themeing engines-->
+  <!-- Copy in GTK+ themeing engines -->
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so</binary>
 
-  <!-- Copy in GTK+ printer backends-->
+  <!-- Copy in GTK+ printer backends -->
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so</binary>
 
-  <!-- Copy in GTK+ printer backends-->
+  <!-- Copy in GTK+ immodules -->
   <binary>${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so</binary>
 
   <!-- Copy in pango modules -->
@@ -115,24 +124,10 @@
     ${prefix}/share/locale
   </translations>
 
-  <!-- data>
-    ${prefix}/share/gtk-demo
-  </data -->
-
-  <!-- Missing dylibs -->
-  <binary>${prefix}/lib/libgimpui-2.0.0.dylib</binary>
-  
-  <!-- Where plugin dylibs need to be explicitly defined -->
-  <binary>${prefix}/lib/liblqr-1.0.dylib</binary>
-  <binary>${prefix}/lib/libexif.12.dylib</binary>
-  <binary>${prefix}/lib/liblcms.1.dylib</binary>
-
   <!-- GTK+2 data -->
   <data>${prefix}/etc/gtk-2.0/*</data>
 
   <!-- Fontconfig data; requires clean up -->
-  <data>${prefix}/etc/fonts/fonts.conf</data>
-  <!--<data>${prefix}/etc/fonts/fonts.conf.bak</data>-->
   <data>${prefix}/etc/fonts/fonts.dtd</data>
   <data>${prefix}/etc/fonts/conf.avail/*</data>
   <data>${prefix}/etc/fonts/conf.d/*</data>
@@ -140,9 +135,6 @@
   <!-- Gimp data -->
   <data>${prefix}/etc/gimp/2.0/*</data>
   <data dest="${bundle}/Contents/Resources/share/gimp">${prefix}/share/gimp</data>
-  <data>${prefix}/lib/gimp/2.0/modules/*.so</data>
-  <data>${prefix}/lib/gimp/2.0/plug-ins/*</data>
-  <data>${prefix}/lib/gimp/2.0/python/*</data>
 
   <!-- Pango data -->
   <data>${prefix}/etc/pango/pango.modules</data>
@@ -157,6 +149,9 @@
   <!-- Theme data-->
   <data>${prefix}/share/themes</data>
 
+  <!-- Theme data-->
+  <data>${prefix}/share/themes</data>
+
   <!-- GTK+ theme data -->
   <data>${prefix}/share/gtk-engines/*.xml</data>
 
@@ -165,6 +160,16 @@
     ${project}/gtkrc
   </data>
 
+  <!-- Interesting defaults -->
+  <data dest="${bundle}/Contents/Resources/etc/gimp/2.0/gimprc">
+    ${project}/gimprc
+  </data>
+
+  <!-- Because fontconfig has terrible defaults -->
+  <data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf">
+    ${project}/fonts.conf
+  </data>
+
   <!-- Icons -->
   <data dest="${bundle}/Contents/Resources">${project}/gimp.icns</data>
   <data dest="${bundle}/Contents/Resources">${project}/xcf.icns</data>
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index 7773c88..d2e8ae7 100644
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -76,18 +76,26 @@
   </autotools>
 
   <!-- Required by some things -->
-  <!--<autotools id="librsvg">
-    <branch module="librsvg/2.32/librsvg-2.32.1.tar.bz2" version="2.32.1"
-	    hash="sha256:91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334"/>
+  <autotools id="librsvg" autogen-sh="configure"
+	     autogenargs="--disable-static --disable-Bsymbolic --enable-introspection=no">
+    <branch module="librsvg/2.36/librsvg-2.36.2.tar.xz" version="2.36.2"
+	    hash="sha256:3906ad8aa5426f6db3891de98d3b72143155282f63c306a71fdb42f3246a1f08"/>
+    <dependencies>
+      <dep package="libcroco"/>
+      <dep package="pango"/>
+      <dep package="gdk-pixbuf"/>
+    </dependencies>
   </autotools>
 
-  <autotools id="libcroco">
+  <autotools id="libcroco" autogen-sh="configure"
+	     autogenargs="--disable-static">
     <branch module="libcroco/0.6/libcroco-0.6.2.tar.bz2" version="0.6.2"
 	    hash="sha256:be24853f64c09b63d39e563fb0222e29bae1a33c3d9f6cbffc0bc27669371749"/>
     <dependencies>
-      <dep package="librsvg"/>
+      <dep package="glib"/>
+      <dep package="libxml2"/>
     </dependencies>
-  </autotools>-->
+  </autotools>
 
   <!-- This is the beginning of the dependencies for gtk-doc -->
   <autotools id="libxml2" autogen-sh="configure">
@@ -190,8 +198,10 @@
 
   <!-- This is glib -->
   <autotools id="glib" autogen-sh="configure" autogenargs="--with-libiconv=native">
-    <branch module="glib/2.32/glib-2.32.3.tar.xz"  version="2.32.3"
-            hash="sha256:b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d"/>
+    <branch module="glib/2.33/glib-2.33.6.tar.xz"  version="2.33.6"
+        hash="sha256:613707eac08d96a421b6d5113f605235a35748eb582bc9c216cbb4ccfcd6f9e8">
+      <patch file="http://bugzilla-attachments.gnome.org/attachment.cgi?id=212477"; strip="1" />
+    </branch>
     <dependencies>
       <dep package="libffi"/>
     </dependencies>
@@ -308,7 +318,7 @@
     </after>
   </autotools>
 
-  <autotools id="gegl" autogen-sh="autogen.sh" autogenargs="--disable-docs">
+  <autotools id="gegl" autogen-sh="autogen.sh" autogenargs="--disable-docs --enable-introspection=no">
     <!--<branch repo="ftp.gtk.org" version="0.2.0"
             module="gegl/0.2/gegl-0.2.0.tar.bz2"/>-->
     <branch repo="git.gnome.org" module="gegl" revision="master"/>
@@ -353,7 +363,7 @@
   </autotools>
 
   <autotools id="gimp"  autogen-sh="autogen.sh"
-             autogenargs="--without-x --disable-docs --without-dbus --without-gnomevfs --without-wmf --enable-binreloc --disable-python" skip-autogen="never"
+             autogenargs="--without-x --disable-docs --without-dbus --enable-introspection=no --without-gnomevfs --without-wmf --enable-binreloc --disable-python" skip-autogen="never"
 	     autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
              makeargs='LDFLAGS="-framework Carbon"'>
     <!--<branch module="gimp/v2.8/gimp-2.8.0.tar.bz2" version="2.8.0"
@@ -394,6 +404,7 @@
     </after>
     <dependencies>
       <dep package="exif"/>
+      <dep package="librsvg"/>
       <dep package="lcms"/>
       <dep package="fontconfig"/>
       <dep package="gegl"/>
diff --git a/build/osx/gimprc b/build/osx/gimprc
new file mode 100644
index 0000000..4f33f51
--- /dev/null
+++ b/build/osx/gimprc
@@ -0,0 +1,3 @@
+(interpolation-type lanczos)
+(default-image
+     (comment "Created with GIMP on a Mac"))
\ No newline at end of file
diff --git a/build/osx/gtkrc b/build/osx/gtkrc
index 7c0dda5..e69de29 100644
--- a/build/osx/gtkrc
+++ b/build/osx/gtkrc
@@ -1 +0,0 @@
-# gtk-theme-name = "Zukitwo"
\ No newline at end of file
diff --git a/build/osx/launcher-python.sh b/build/osx/launcher-python.sh
index 1699c0d..2ec4699 100755
--- a/build/osx/launcher-python.sh
+++ b/build/osx/launcher-python.sh
@@ -50,8 +50,8 @@ export FONTCONFIG_FILE="$bundle_etc/fonts/fonts.conf"
 # Help gdk find its loader modules
 export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
 
-# Fix for the theme engine paths is no longer required
-# export GTK_PATH="$bundle_lib/gtk-2.0/2.10.0"
+# Fix for the theme engine paths
+export GTK_PATH="$bundle_lib/gtk-2.0/2.10.0"
 
 # GTK path no longer required
 # export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
@@ -59,8 +59,17 @@ export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
 # Pango path no longer required
 # export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
 
+# Fix the gegl path issue
+export GEGL_PATH="$bundle_lib/gegl-0.2"
+
 # Define gtkrc file
-# export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+
+# Workaround for <https://bugzilla.gnome.org/show_bug.cgi?id=671817>
+if [ ! -f "$HOME/.local/share/recently-used.xbel" ]
+then
+    mkdir -p "$HOME/.local/share"
+fi
 
 # Strip out arguments added by the OS
 if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]