diff --git bundler/bundler.py bundler/bundler.py
index abca042..8db5e13 100644
--- bundler/bundler.py
+++ bundler/bundler.py
@@ -73,7 +73,7 @@ class Bundler:
module_version = utils.evaluate_pkgconfig_variables("${pkg:pango:pango_module_version}")
modulespath = self.project.get_bundle_path("Contents/Resources/lib/pango/" +
module_version +
- "modules/")
+ "/modules/")
from distutils.version import StrictVersion as V
import tempfile
diff --git bundler/launcher.sh bundler/launcher.sh
index 7b15121..069fbda 100755
--- bundler/launcher.sh
+++ bundler/launcher.sh
@@ -33,7 +33,8 @@ export GTK_PATH="$bundle_res"
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 PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_LIBDIR="$bundle_lib"
+export PANGO_SYSCONFDIR="$bundle_etc"
# Localization settings. It's better to do this inside your program
# using NSLocale if possible.
diff --git bundler/run-install-name-tool-change.sh bundler/run-install-name-tool-change.sh
index 3a3b6a8..a69796a 100755
--- bundler/run-install-name-tool-change.sh
+++ bundler/run-install-name-tool-change.sh
@@ -10,6 +10,8 @@ WRONG_PREFIX=$2
RIGHT_PREFIX="@executable_path/../$3"
ACTION=$4
+chmod u+w $LIBRARY
+
if [ "x$ACTION" == "xchange" ]; then
libs="`otool -L $LIBRARY 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $WRONG_PREFIX | sort | uniq`"
for lib in $libs; do
diff --git examples/Info-gtk-demo.plist examples/Info-gtk-demo.plist
index a47c60d..80b04f4 100644
--- examples/Info-gtk-demo.plist
+++ examples/Info-gtk-demo.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
GtkDemo
CFBundleGetInfoString
- 2.16.2, (C) 1997-2009 The GTK+ Team http://www.gtk.org
+ 2.24.18, (C) 1997-2013 The GTK+ Team http://www.gtk.org
CFBundleIconFile
Giggle.icns
CFBundleIdentifier
@@ -17,13 +17,13 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.16.2
+ 2.24.18
CFBundleSignature
????
CFBundleVersion
- 2.16.2
+ 2.24.18
NSHumanReadableCopyright
- Copyright 1997 - 2009 The GTK+ Tean, GNU General Public License.
+ Copyright 1997 - 2013 The GTK+ Team, GNU General Public License.
LSMinimumSystemVersion
10.4
diff --git examples/Info-pygtk-demo.plist examples/Info-pygtk-demo.plist
index 37876b4..55b6807 100644
--- examples/Info-pygtk-demo.plist
+++ examples/Info-pygtk-demo.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
PyGtkDemo
CFBundleGetInfoString
- 2.16.0, (C) 1997-2009 The GTK+ Team http://www.gtk.org
+ 2.24.0, (C) 1997-2012 The GTK+ Team http://www.gtk.org
CFBundleIconFile
Giggle.icns
CFBundleIdentifier
@@ -17,13 +17,13 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.16.0
+ 2.24.0
CFBundleSignature
????
CFBundleVersion
- 2.16.0
+ 2.24.0
NSHumanReadableCopyright
- Copyright 1997 - 2009 The GTK+ Tean, GNU General Public License.
+ Copyright 1997 - 2012 The GTK+ Team GNU General Public License.
LSMinimumSystemVersion
10.5
diff --git examples/gtk-demo.bundle examples/gtk-demo.bundle
index 32173b9..4b32d6b 100644
--- examples/gtk-demo.bundle
+++ examples/gtk-demo.bundle
@@ -69,16 +69,25 @@
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
+
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
- ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
+
+
+
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
-
diff --git examples/gtk3-demo.bundle examples/gtk3-demo.bundle
index b74f2ca..ba15cd3 100644
--- examples/gtk3-demo.bundle
+++ examples/gtk3-demo.bundle
@@ -33,7 +33,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- ${project}/launcher.sh
+ ${project}/gtk3-launcher.sh
+
- ${prefix}/lib/${gtkdir}/modules/*.so
+ ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
-
-
- ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/theming-engines/*.so
-
+
${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
@@ -78,6 +69,14 @@
${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
+
+ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
+
+
+
+ ${prefix}/etc/pango/
+
+
- ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
-
diff --git examples/pygtk-demo.sh examples/pygtk-demo.sh
index 9c8ec33..ecbf1c0 100755
--- examples/pygtk-demo.sh
+++ examples/pygtk-demo.sh
@@ -22,7 +22,8 @@ export GTK_PATH="$bundle_res"
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 PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_LIBDIR="$bundle_lib"
+export PANGO_SYSCONFDIR="$bundle_etc"
#Set $PYTHON to point inside the bundle
export PYTHON="$bundle_contents/MacOS/python"