[gimp/gimp-2-8] Organize OSX build files

commit faa233666adf5b907a30712ccd476048ecbc5ba9
Author: Clayton Walker <clayton m walker gmail com>
Date:   Fri Oct 11 12:38:16 2013 -0600

    Organize OSX build files

 build/osx/README                  |  104 ++++++++++---------
 build/osx/{ => custom}/fonts.conf |    6 +-
 build/osx/custom/gimp.desktop     |  202 +++++++++++++++++++++++++++++++++++++
 build/osx/{ => custom}/gimprc     |    0
 build/osx/custom/gtkrc            |   14 +++
 build/osx/custom/mimeinfo.cache   |   32 ++++++
 build/osx/custom/open.desktop     |    7 ++
 build/osx/custom/session.conf     |   64 ++++++++++++
 build/osx/gimp-2.8-python.bundle  |   21 +++-
 9 files changed, 393 insertions(+), 57 deletions(-)
diff --git a/build/osx/README b/build/osx/README
index 77b51dd..4b2ba66 100644
--- a/build/osx/README
+++ b/build/osx/README
@@ -1,79 +1,85 @@
-This are simple step-by-step instructions on how to build gimp on Mac OSX. This guide assumes that you are 
already somewhat familiar with jhbuild. Before you begin, it's best to remove all references to previous 
jhbuild, MacPorts, or HomeBrew install from your .profile. Sometimes configure will still pick up random 
libraries installed in other prefixes (like /opt/local/ or /opt/X11 for example). I recommend moving /opt/ to 
/opt2/ during the build process.
+Minimal quick start guide in order to get a working version of gimp on OSX. For this to work properly, 
remove all traces of any previous Macports, Homebrew, or jhbuild installation.
-The dollar sign precedes terminal commands.
+The dollar sign precedes any terminal commands.
-Temporarily moving a MacPorts or XQuartz installation to another prefix:
-$ sudo mv /opt /opt2
+Backup "~/.profile" for a fresh start.
+$ if [ -f $HOME/.profile ]; \
+  then \
+  mv $HOME/.profile $HOME/.profile-bak \
+  fi
-To move the files back:
-$ sudo mv /opt2 /opt
-These commands will check for a .profile in your $HOME directory. If one exists, it will rename it.
-$ if [ -f $HOME/.profile ];
-$ then
-$ mv $HOME/.profile $HOME/.profile-backup
-$ fi
-For non-Lion users, you will need to install git in order to install jhbuild. You can download a Mac binary 
-Once you have git set up, you should download and install jhbuild:
+Most OSX installations come with git preinstalled. If you do not have git installed, you can download a 
prebuilt binary from here:
+Download and install jbuild
 $ cd $HOME
 $ curl -O http://git.gnome.org/browse/gtk-osx/plain/gtk-osx-build-setup.sh
 $ chmod +x gtk-osx-build-setup.sh
 $ sh gtk-osx-build-setup.sh
-Now add the jhbuild path to your shell and new .profile:
+Add jhbuild install dir to your $PATH and ~/.profile
 $ export PATH=$HOME/.local/bin:$PATH
 $ echo 'export PATH=$HOME/.local/bin:$PATH' > $HOME/.profile
-In order to properly install gimp on osx you will need to use a preconfigured jhbuildrc provided by gimp:
-$ curl -o $HOME/.jhbuildrc-gimp http://git.gnome.org/browse/gimp/plain/build/osx/jhbuildrc-gimp?h=gimp-2-8
+Download a custom jhbuild files for gimp
+$ curl -o $HOME/.jhbuildrc-gimp http://git.gnome.org/browse/gimp/plain/build/osx/jhbuildrc-gimp?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/gimp.modules 
 Now you can download and install gimp, where 'gimp' is the directory prefix, and '10.6' is the minimum 
version you are building gimp for. As it stands, you should be able to leave the values as they are.
-$ JHB=gimp GIMP_SDK=10.6 jhbuild bootstrap --ignore-system
-Now we'll start with freetype, since it's a troublesome one.
-$ JHB=gimp GIMP_SDK=10.6 jhbuild build freetype
+$ JHB=gimp GIMP_SDK=10.6 jhbuild bootstrap
-The funny thing about jhbuild is that it's no perfect. Meaning you'll have to coax it along. To begin with, 
neither freetype nor zlib will actually bother configuring themselves. To fix this, you'll need to drop out 
of jhbuild (or simply open up another Terminal window) and enter the jhbuild shell.
+This process requires some manual intervention. When the build fails on xml-parser, open a new shell and 
complete the install
 $ JHB=gimp GIMP_SDK=10.6 jhbuild shell
-Then, cd into the freetype and zlib and pass the proper configure commands yourself.
-$ cd ~/gimp/10.6/source/freetype[freetype version here]
-$ ./configure --prefix=$PREFIX
+$ cd ~/gimp/source/XML-Parser-[parser version here]
 $ make -j3
 $ make -j3 install
-Do the same for zlib when the error comes about.
-$ JHB=gimp GIMP_SDK=10.6 jhbuild build zlib
 NOTE: When the perl module pops up, it may tell you that it can neither make nor install. That's fine, just 
enter "2" and then press the enter key, and then press "2" again and hit the enter key again.
-Now that all of that is taken care of, we can finally move on. In order to build gimp, just type this in.
+Do the same for simple-xml
+$ cd ~/gimp/source/XML-Simple-[simple version here]
+$ make -j3
+$ make -j3 install
+Now we can build gimp
+$ JHB=gimp GIMP_SDK=10.6 jhbuild build gimp-2.8-python
-$ JHB=gimp GIMP_SDK=10.6 jhbuild build gimp-2.8
+If you would like the gtk murrine theme, you can install it as well
+# JHB=gimp GIMP_SDK=10.6 jhbuild build murrine-engine
-## Ignore ##
-This should work. However, in the odd change that, during the compiling of gimp, docbook.make (or the like) 
is not found, you should copy and paste the configure script and options in the gimp source folder. Note, all 
you need to do is configure gimp once, then jhbuild will be able to handle gimp by itself.
-## Ignore ##
+In order to run gimp with dbus support (required for gvfs and gio)
+$ dbus-launch gimp-2.8
-In order to create a .app you'll need to download an install gtk-mac-bundler.
-This will install gtk-mac-bundler into ~/.local/bin.
+This will generate a dbus session. If you continuously run gimp using this method, you will end up with many 
dbus sessions being run. Kill them after all gimp instances have been killed. 
-$ cd $HOME/Source/
+In order to create a .app you'll need to download and install gtk-mac-bundler
+$ cd $HOME/source/
 $ git clone https://github.com/jralls/gtk-mac-bundler.git
 $ cd gtk-mac-bundler/
 $ make install
-Now create the gimp.app.
-$ cd $HOME/gimp/10.6/source/gimp/build/osx
-$ gtk-mac-bundler gimp-2.8.bundle
-Please note that this is not a finished process, and there are a few issues that still need to be fixed. 
Please join #gimp on irc.gimp.org if you have any questions.
+To create a bundle, we need some more files
+$ curl -o $HOME/gimp/directory/gimp-2.8-python.bundle 
http://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 
http://git.gnome.org/browse/gimp/plain/build/osx/launcher-2.8-python.sh?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/info-2.8-python.plist 
http://git.gnome.org/browse/gimp/plain/build/osx/info-2.8-python.plist?h=gimp-2-8 &&
+  chmod +x launcher-2.8-python.sh &&
+  curl -o $HOME/gimp/directory/gimp.icns 
http://git.gnome.org/browse/gimp/plain/build/osx/gimp.icns?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/xcf.icns http://git.gnome.org/browse/gimp/plain/build/osx/xcf.icns?h=gimp-2-8 
+  curl -o $HOME/gimp/directory/custom/fonts.conf 
http://git.gnome.org/browse/gimp/plain/build/osx/custom/fonts.conf?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/custom/gimp.desktop 
http://git.gnome.org/browse/gimp/plain/build/osx/custom/gimp.desktop?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/custom/gimprc 
http://git.gnome.org/browse/gimp/plain/build/osx/custom/gimprc?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/custom/gtkrc 
http://git.gnome.org/browse/gimp/plain/build/osx/custom/gtkrc?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/custom/mimeinfo.cache 
http://git.gnome.org/browse/gimp/plain/build/osx/custom/mimeinfo.cache?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/custom/open.desktop 
http://git.gnome.org/browse/gimp/plain/build/osx/custom/open.desktop?h=gimp-2-8 &&
+  curl -o $HOME/gimp/directory/custom/sesstion.conf 
+We also need to fix a few outstanding issues
+$ cp ~/gimp/10.6/source/gettext- ~/gimp/10.6/inst/lib
+$ chmod +w $PREFIX/lib/libpython2.7.dylib
+Now we can run the bundler
+$ cd $HOME/gimp/directory
+$ gtk-mac-bundler gimp-2.8-python.bundle
+Please note that this is not a flawless process, and there are a few issues that still need to be fixed. 
Please join #gimp on irc.gimp.org if you have any questions.
\ No newline at end of file
diff --git a/build/osx/fonts.conf b/build/osx/custom/fonts.conf
similarity index 98%
rename from build/osx/fonts.conf
rename to build/osx/custom/fonts.conf
index 50f1868..15bf763 100644
--- a/build/osx/fonts.conf
+++ b/build/osx/custom/fonts.conf
@@ -26,9 +26,9 @@
-       <dir>/Library/Fonts</dir>
-        <dir>/Network/Library/Fonts</dir>
+        <dir>/Network/Library/Fonts</dir>
+       <dir>/Library/Fonts</dir>
@@ -75,7 +75,7 @@
 <!-- Font cache directory list -->
-       <cachedir>~/Library/Caches/org.freedesktop.fontconig</cachedir>
+       <cachedir>~/Library/Caches/org.freedesktop.fontconfig</cachedir>
diff --git a/build/osx/custom/gimp.desktop b/build/osx/custom/gimp.desktop
new file mode 100644
index 0000000..f8e0d54
--- /dev/null
+++ b/build/osx/custom/gimp.desktop
@@ -0,0 +1,202 @@
+[Desktop Entry]
+Name=GNU Image Manipulation Program
+Name[ar]=برنامج جنو لمعالجة الصور
+Name[ast]=Programa de manipulación d'Imaxe GNU
+Name[be]=GIMP — праґрама праекту GNU для працы зь відарысамі
+Name[bg]=Редактор на изображения (GIMP)
+Name[br]=Goulev da zornata skeudennoù GNU
+Name[ca]=Programa de retoc d'imatges de GNU
+Name[ca valencia]=Programa de retoc d'imatges de GNU
+Name[cs]=GNU Image Manipulation Program
+Name[csb]=Editora òbrôzów GIMP
+Name[da]=GNU Image Manipulation Program
+Name[de]=GNU Image Manipulation Program
+Name[el]=Πρόγραμμα επεξεργασίας εικόνων GNU
+Name[en_CA]=GNU Image Manipulation Program
+Name[en_GB]=GNU Image Manipulation Program
+Name[eo]=Bildmanipulilo (GIMP = GNU Image Manipulation Program)
+Name[es]=Programa de manipulación de imágenes de GNU
+Name[et]=GIMP - GNU pilditöötlusprogramm
+Name[eu]=GNUren Irudiak Manipulatzeko Programa
+Name[fa]=برنامهٔ روتوش تصاویر گنو
+Name[fr]=Éditeur d'image GIMP
+Name[gl]=Programa de Manipulación de Imaxes de GNU
+Name[gu]=GNU ચિત્ર જાળવણી કાર્યક્રમ
+Name[he]=תוכנת עיבוד התמונה של GNU
+Name[hu]=A GNU képszerkesztő program
+Name[is]=GNU Myndvinnsluforrit
+Name[it]=GNU Image Manipulation Program
+Name[ja]=GIMP (GNU Image Manipulation Program)
+Name[km]=កម្មវិធី​រៀបចំ​រូបភាពរបស់ GNU
+Name[kn]=GNU ಇಮೇಜ್ ಮ್ಯಾನಿಪುಲೇಶನ್ ಪ್ರೊಗ್ರಾಮ್
+Name[ko]=GNU Image Manipulation Program
+Name[lt]=GNU paveikslėlių manipuliavimo programa
+Name[lv]=GNU attēlu apstrādes programma
+Name[mk]=ГНУ програма за манипулација со слики
+Name[ml]=GNU Image Manipulation Program
+Name[my]=GNU ရုပ်ပုံ စီမံကိုင်တွယ်ရေး ပရိုဂရမ်
+Name[nb]=GNU bildebehandlingsprogram
+Name[nds]=GNU Billbewarkenprogramm
+Name[ne]=जी एन यू छवि परिचालन कार्यक्रम
+Name[nl]=GNU Image Manipulation Program
+Name[nn]=GNU biletbehandlingsprogram
+Name[pa]=ਗਨੂ ਈਮੇਜ਼ ਮੈਨੂਪਲੇਸ਼ਨ ਪਰੋਗਰਾਮ
+Name[pl]=Edytor obrazów GIMP
+Name[pt]=Programa de Manipulação de Imagens GNU
+Name[pt_BR]=Programa de manipulação de imagem do GNU
+Name[ru]=GNU Image Manipulation Program
+Name[si]=GNU Image Manipulation Program
+Name[sk]=GNU program na manipuláciu s obrázkami
+Name[sl]=GIMP - program GNU za obdelavo slik
+Name[sr]=Гнуов програм за обраду слика
+Name[sr latin]=Gnuov program za obradu slika
+Name[sv]=GNU:s bildmanipuleringsprogram
+Name[ta]=க்னூ பட கையாளல் நிரல்
+Name[te]=గ్నూ ఇమేజ్ మానిప్యులేషన్ ప్రోగ్రామ్
+Name[th]=GNU Image Manipulation Program
+Name[tr]=GNU Görüntü İşleme Programı
+Name[tt]=Sürät Eşkärtüçe GNU-Yasılım
+Name[uk]=GNU Image Manipulation Program
+Name[vi]=Chương Trình Thao Tác Ảnh GNU
+Name[zh_CN]=GNU 图像处理程序
+Name[zh_HK]=GNU 圖片處理程式
+Name[zh_TW]=GNU 圖片處理程式
+GenericName=Image Editor
+GenericName[ar]=محرر صور
+GenericName[ast]=Editor d'imaxe
+GenericName[be]=Рэдактар відарысаў
+GenericName[bg]=Редактор на изображения
+GenericName[br]=Embanner skeudennoù
+GenericName[ca]=Editor d'imatges
+GenericName[ca valencia]=Editor d'imatges
+GenericName[cs]=Editor obrázků
+GenericName[dz]=གཟུགས་བརྙན་ ཞུན་དག་པ།
+GenericName[el]=Επεξεργαστής εικόνων
+GenericName[en_CA]=Image Editor
+GenericName[en_GB]=Image Editor
+GenericName[es]=Editor de imagen
+GenericName[fa]=ویرایشگر تصویر
+GenericName[fr]=Éditeur d'image
+GenericName[gl]=Editor de imaxes
+GenericName[gu]=ચિત્ર સંપાદક
+GenericName[id]=Penyunting Gambar
+GenericName[it]=Modifica immagine
+GenericName[ka]=გამოსახულებების რედაქტორი
+GenericName[kn]=ಚಿತ್ರ ಸಂಪಾದಕ
+GenericName[ko]=이미지 편집기
+GenericName[lt]=Paveikslėlių rengyklė
+GenericName[lv]=Attēla redaktors
+GenericName[mk]=Уредник за слики
+GenericName[my]=ရုပ်ပုံ တည်းဖြတ်ကိရိယာ
+GenericName[ne]=छवि सम्पादक
+GenericName[pa]=ਚਿੱਤਰ ਐਡੀਟਰ
+GenericName[pl]=Edytor obrazów
+GenericName[pt]=Editor de Imagens
+GenericName[pt_BR]=Editor de imagens
+GenericName[ro]=Editor de imagini
+GenericName[ru]=Редактор изображений
+GenericName[sk]=Editor obrázkov
+GenericName[sl]=Urejevalnik slik
+GenericName[sr]=Обрада слика
+GenericName[sr latin]=Obrada slika
+GenericName[ta]=பிம்ப திருத்தி
+GenericName[te]=బొమ్మ కూర్పకము
+GenericName[tr]=Görüntü Düzenleyici
+GenericName[tt]=Sürät Tözätkeç
+GenericName[uk]=Редактор зображень
+GenericName[vi]=Bộ biên soạn ảnh
+GenericName[xh]=UmHleli woMfanekiso
+Comment=Create images and edit photographs
+Comment[ar]=أنشئ صورا وحرّر لقطات
+Comment[ast]=Cree imáxenes y edite semeyes
+Comment[be]=Стварэньне відарысаў і праўленьне фатаздымкаў
+Comment[bg]=Създаване на изображения и редакция на снимки
+Comment[br]=Krouiñ hag embann skeudennoù pe luc'hskeudennoù
+Comment[ca]=Creeu imatges i editeu fotografies
+Comment[ca valencia]=Creeu imatges i editeu fotografies
+Comment[cs]=Vytvářet obrázky a upravovat fotografie
+Comment[da]=Opret billeder og redigér fotografier
+Comment[de]=Bilder erstellen und Fotografien bearbeiten
+Comment[dz]=གཟུགས་བརྙན་ཚུ་ གསར་བསྐྲུན་འབད་ནི་དང་ དཔར་ཚུ་ཞུན་དག་འབད།
+Comment[el]=Δημιουργία εικόνων και επεξεργασία φωτογραφιών
+Comment[en_CA]=Create images and edit photographs
+Comment[en_GB]=Create images and edit photographs
+Comment[eo]=Krei bildojn aŭ redakti fotaĵojn
+Comment[es]=Cree imágenes y edite fotografías
+Comment[et]=Loo pilte ja redigeeri fotosid
+Comment[eu]=Sortu irudiak eta editatu argazkiak
+Comment[fi]=Luo kuvia ja muokkaa valokuvia
+Comment[fr]=Créer des images et modifier des photographies
+Comment[gl]=Crear imaxes e editar fotografías
+Comment[gu]=ચિત્રો બનાવો અને ફોટાઓમાં ફેરફાર કરો
+Comment[hu]=Képek létrehozása és fotók szerkesztése
+Comment[id]=Buat gambar dan sunting foto
+Comment[is]=Búa til myndir og breyta ljósmyndum
+Comment[it]=Crea immagini e modifica fotografie
+Comment[km]=បង្កើត​រូបភាព និង កែសម្រួល​រូបថត
+Comment[kn]=ಚಿತ್ರಗಳನ್ನು ರಚಿಸಿ ಹಾಗು ಫೋಟೋಗ್ರಾಫ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಿ
+Comment[ko]=이미지를 만들고 사진을 편집합니다
+Comment[lt]=Kurti paveikslėlius ir redaguoti fotografijas
+Comment[lv]=Veido attēlus vai rediģē fotogrāfijas
+Comment[mk]=Направи слики и уреди фотографии
+Comment[my]=ရုပ်ပုံများကို ဖန်တီးပြီး ဓါတ်ပုံများကို တည်းဖြတ်ပါ
+Comment[nb]=Lag bilder og rediger fotografier
+Comment[ne]=छवि सिर्जना गर्नुहोस् र फोटोग्राफ सम्पादन गर्नुहोस्
+Comment[nl]=Afbeeldingen of foto's aanmaken en bewerken
+Comment[nn]=Lag teikningar eller rediger foto
+Comment[pa]=ਚਿੱਤਰ ਬਣਾਓ ਅਤੇ ਤਸਵੀਰਾਂ ਸੋਧੋ
+Comment[pl]=Tworzenie oraz obróbka obrazów i fotografii
+Comment[pt]=Criar imagens e editar fotografias
+Comment[pt_BR]=Crie e edite imagens ou fotografias
+Comment[ro]=Creează imagini și editează fotografii
+Comment[ru]=Создание изображений и редактирование фотографий
+Comment[sk]=Vytvárajte a upravujte obrázky alebo fotografie
+Comment[sl]=Ustvari slike in uredi fotografije
+Comment[sr]=Направите слике и уредите фотографије
+Comment[sr latin]=Napravite slike i uredite fotografije
+Comment[sv]=Skapa bilder och redigera fotografier
+Comment[ta]=பிம்பங்களை உருவாக்கவும் மற்றும் படங்களை திருத்தவும்
+Comment[te]=బొమ్మలను సృష్టించు మరియు చిత్రాలను సవరించు
+Comment[tr]=Görüntü oluşturur ve fotoğraf düzenler
+Comment[uk]=Створення зображень та редагування фотографій
+Comment[vi]=Tạo và biên soạn ảnh hay ảnh chụp
+Exec=gimp-2.8 %U
diff --git a/build/osx/gimprc b/build/osx/custom/gimprc
similarity index 100%
rename from build/osx/gimprc
rename to build/osx/custom/gimprc
diff --git a/build/osx/custom/gtkrc b/build/osx/custom/gtkrc
new file mode 100644
index 0000000..fd46231
--- /dev/null
+++ b/build/osx/custom/gtkrc
@@ -0,0 +1,14 @@
+# Include Zukitwo path to fix plugins not applying theme
+include "../../share/themes/Zukitwo/gtk-2.0/gtkrc"
+# Set default theme to Zukitwo
+gtk-theme-name = "Zukitwo"
+# Include Elementary path to fix plugins not applying theme
+# include "../../share/themes/Elementary/gtk-2.0/gtkrc"
+# Set default theme to Elementary
+# gtk-theme-name = "Elementary"
+# Include Mac path to fix plugins not applying key-bindings
+include "../../share/themes/Mac/gtk-2.0-key/gtkrc"
+# Set default key-bindings to Mac
+gtk-key-theme-name = "Mac"
\ No newline at end of file
diff --git a/build/osx/custom/mimeinfo.cache b/build/osx/custom/mimeinfo.cache
new file mode 100644
index 0000000..ce8cb4c
--- /dev/null
+++ b/build/osx/custom/mimeinfo.cache
@@ -0,0 +1,32 @@
+[MIME Cache]
diff --git a/build/osx/custom/open.desktop b/build/osx/custom/open.desktop
new file mode 100644
index 0000000..e4a2d7e
--- /dev/null
+++ b/build/osx/custom/open.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Exec=open %U
diff --git a/build/osx/custom/session.conf b/build/osx/custom/session.conf
new file mode 100644
index 0000000..6ddde3b
--- /dev/null
+++ b/build/osx/custom/session.conf
@@ -0,0 +1,64 @@
+<!-- This configuration file controls the per-user-login-session message bus.
+     Add a session-local.conf and edit that rather than changing this 
+     file directly. -->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+  <!-- If we fork, keep the user's original umask to avoid affecting
+       the behavior of child processes. -->
+  <keep_umask/>
+  <!--<listen>launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET</listen>-->
+  <listen>unix:tmpdir=/var/tmp</listen>
+  <standard_session_servicedirs />
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+  <!-- Config files are placed here that among other things, 
+       further restrict the above policy for specific services. -->
+  <includedir>session.d</includedir>
+  <!-- This is included last so local configuration can override what's 
+       in this standard file -->
+  <include ignore_missing="yes">session-local.conf</include>
+  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+  <!-- For the session bus, override the default relatively-low limits 
+       with essentially infinite limits, since the bus is just running 
+       as the user anyway, using up bus resources is not something we need 
+       to worry about. In some cases, we do set the limits lower than 
+       "all available memory" if exceeding the limit is almost certainly a bug, 
+       having the bus enforce a limit is nicer than a huge memory leak. But the 
+       intent is that these limits should never be hit. -->
+  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
+  <limit name="max_incoming_bytes">1000000000</limit>
+  <limit name="max_incoming_unix_fds">250000000</limit>
+  <limit name="max_outgoing_bytes">1000000000</limit>
+  <limit name="max_outgoing_unix_fds">250000000</limit>
+  <limit name="max_message_size">1000000000</limit>
+  <limit name="max_message_unix_fds">1024</limit>
+  <limit name="service_start_timeout">120000</limit>  
+  <limit name="auth_timeout">240000</limit>
+  <limit name="max_completed_connections">100000</limit>  
+  <limit name="max_incomplete_connections">10000</limit>
+  <limit name="max_connections_per_user">100000</limit>
+  <limit name="max_pending_service_starts">10000</limit>
+  <limit name="max_names_per_connection">50000</limit>
+  <limit name="max_match_rules_per_connection">50000</limit>
+  <limit name="max_replies_per_connection">50000</limit>
diff --git a/build/osx/gimp-2.8-python.bundle b/build/osx/gimp-2.8-python.bundle
index 34591d6..4e27236 100644
--- a/build/osx/gimp-2.8-python.bundle
+++ b/build/osx/gimp-2.8-python.bundle
@@ -118,12 +118,23 @@
   <!-- Copy in mime data -->
   <!-- Used for opening up help in browser -->
-  <data>${prefix}/share/applications/*</data>
+  <data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
+    ${project}/custom/gimp.desktop
+  </data>
+  <data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
+    ${project}/custom/open.desktop
+  </data>
+  <data dest="${bundle}/Contents/Resources/share/applications/gimp.desktop">
+    ${project}/custom/mimeinfo.cache
+  </data>
   <!-- Copy in dbus Launch session support -->
-  <data>${prefix}/etc/dbus-1/*</data>
+  <data>${prefix}/etc/dbus-1/system.conf</data>
+  <data dest="${bundle}/Contents/Resources/etc/dbus-1/session.conf">
+    ${project}/custom/session.conf
+  </data>
   <!-- Copy in gvfs file support -->
@@ -150,17 +161,17 @@
   <!-- Change default theme -->
   <data dest="${bundle}/Contents/Resources/etc/${gtkdir}/gtkrc">
-    ${project}/gtkrc
+    ${project}/custom/gtkrc
   <!-- Copy in better defaults -->
   <data dest="${bundle}/Contents/Resources/etc/gimp/2.0/gimprc">
-    ${project}/gimprc
+    ${project}/custom/gimprc
   <!-- Copy in better fontconfig defaults -->
   <data dest="${bundle}/Contents/Resources/etc/fonts/fonts.conf">
-    ${project}/fonts.conf
+    ${project}/custom/fonts.conf
   <!-- Copy in icons -->

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]