From 5526f64e1f228c08ae90707d6e866981310e0040 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 23 Dec 2012 02:17:31 +0000 Subject: [PATCH] Mods for Gtk3, Gramps 4.0.0 svn: r20827 --- mac/Info.plist | 6 ++-- mac/gramps.bundle | 80 ++++++++++++++++++++++++++------------------- mac/gramps.launcher | 11 +++---- mac/gramps.modules | 36 +++++++++++++++----- 4 files changed, 82 insertions(+), 51 deletions(-) diff --git a/mac/Info.plist b/mac/Info.plist index ef1f353b4..a2c109583 100755 --- a/mac/Info.plist +++ b/mac/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable Gramps CFBundleGetInfoString - Trunk, (C) 1997-2012 The Gramps Team http://www.gramps-project.org + 4.0.0-alpha1, (C) 1997-2012 The Gramps Team http://www.gramps-project.org CFBundleIconFile gramps.icns CFBundleIdentifier @@ -15,13 +15,13 @@ CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType - APPL + 4.0.0-alpha1 CFBundleShortVersionString Trunk CFBundleSignature ???? CFBundleVersion - Trunk + 4.0.0-alpha1 NSHumanReadableCopyright Copyright 1997 - 2012 The Gramps Team, GNU General Public License. LSMinimumSystemVersion diff --git a/mac/gramps.bundle b/mac/gramps.bundle index 9db6ab404..e5ff19f1c 100644 --- a/mac/gramps.bundle +++ b/mac/gramps.bundle @@ -6,6 +6,9 @@ ${env:HOME}/Desktop ${project}/gramps.launcher + + gtk+-3.0 ${project}/Info.plist @@ -27,23 +30,18 @@ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/ - + - ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so - ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so - ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-fc.so - - - - - ${prefix}/lib/libpyglib-2.0-python.0.dylib + ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so @@ -59,15 +57,7 @@ - ${prefix}/lib/libgoocanvas.3.dylib - - - - ${prefix}/lib/libgtkmacintegration.0.dylib - - - - ${prefix}/lib/libart_lgpl_2.2.dylib + ${prefix}/lib/libgtkmacintegration.2.dylib @@ -87,7 +77,7 @@ - ${prefix}/lib/libosmgpsmap.2.dylib + ${prefix}/lib/libosmgpsmap.3.dylib @@ -110,7 +100,27 @@ want to copy in to the bundle. The "dest" attribute is optional, as usual. Bundler will find all translations of that library/program under the indicated directory and copy them.--> - + + ${prefix}/share/locale + + + + ${prefix}/share/locale + + + + ${prefix}/share/locale + + + + ${prefix}/share/locale + + + + ${prefix}/share/locale + + + ${prefix}/share/locale @@ -121,6 +131,10 @@ + + ${prefix}/share/glib-2.0/schemas + + ${prefix}/lib/python2.7/*.py @@ -133,10 +147,6 @@ ${prefix}/include/python2.7/pyconfig.h - - ${prefix}/share/gramps/ - - @@ -149,6 +159,18 @@ ${prefix}/share/mime/ + + ${prefix}/lib/python2.7/site-packages/gramps/*.glade + + + + ${prefix}/lib/python2.7/site-packages/gramps/data/ + + + + ${prefix}/lib/python2.7/site-packages/gramps/images/*.png + + ${prefix}/share/mime-info/ @@ -171,15 +193,7 @@ ${project}/gramps.icns - - - - ${project}/gtkrc - - - + ${project}/gramps.accel diff --git a/mac/gramps.launcher b/mac/gramps.launcher index 54d48e548..ebe4b9a48 100755 --- a/mac/gramps.launcher +++ b/mac/gramps.launcher @@ -21,9 +21,8 @@ export GTK_EXE_PREFIX="$bundle_res" export GTK_PATH="$bundle_res" export PANGO_RC_FILE="$bundle_etc/pango/pangorc" -export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders" -export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules" -export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" +export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders" +export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules" export GVBINDIR="$bundle_lib/graphviz" @@ -31,10 +30,8 @@ export GVBINDIR="$bundle_lib/graphviz" PYVER=2.7 export PYTHON="$bundle_contents/MacOS/python" export PYTHONHOME="$bundle_res" -PYTHONPATH="$bundle_lib/python$PYVER/site-packages/pyenchant-1.6.1-py$PYVER.egg:$PYTHONPATH" -export PYTHONPATH="$bundle_lib/python$PYVER/site-packages/gtk-2.0:$PYTHONPATH" -export GRAMPSDIR="$bundle_data"/gramps +export GRAMPSDIR="$bundle_lib/python$PYVER/site-packages/gramps" export GRAMPSI18N="$bundle_data"/locale export GRAMPSHOME="$HOME/Library/Application Support" @@ -42,5 +39,5 @@ export GRAMPSHOME="$HOME/Library/Application Support" if /bin/expr "x$1" : '^x-psn_' > /dev/null; then shift 1 fi -exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@" +exec "$PYTHON" -O "$bundle_contents/MacOS/Gramps-bin" "$@" diff --git a/mac/gramps.modules b/mac/gramps.modules index 4cb2c2e63..1760619f2 100644 --- a/mac/gramps.modules +++ b/mac/gramps.modules @@ -59,8 +59,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle - - + + @@ -81,6 +81,24 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle + + + + + + + + + + + + + + + + + @@ -127,17 +145,19 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle version="0.7.3"/> - - - + + + + + + + - + - -