From 30f69d32e03d8bb2b601bf9cf85e8fb3189d06de Mon Sep 17 00:00:00 2001 From: Joshua Pettus Date: Tue, 10 Mar 2015 14:27:20 -0400 Subject: [PATCH] Include Pango Modules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Before I was using a special macports variant that had the pango modules built into the library. Now that I know a little bit more, it’s really not necessary to require a special variant here. --- Makefile.am | 9 ++++++++- osxapp/XBoard.gtklauncher | 4 +++- osxapp/pango.modules | 5 ----- 3 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 osxapp/pango.modules diff --git a/Makefile.am b/Makefile.am index 16f990a..1523180 100644 --- a/Makefile.am +++ b/Makefile.am @@ -295,9 +295,11 @@ osxapp: all-recursive install install-recursive $(INSTALL) ./osxapp/launcher_rc $(datarootdir)/ $(INSTALL) /opt/local/etc/gtk-2.0/im-multipress.conf $(sysconfdir)/gtk-2.0 $(INSTALL) ./osxapp/gtkrc $(sysconfdir)/gtk-2.0/gtkrc - $(INSTALL) ./osxapp/pango.modules $(sysconfdir)/pango/pangorc + sed -e '/ModuleFiles = \/opt\/local\/etc\/pango\/pango.modules/d' $(sysconfdir)/pango/pangorc + sed -e 's?/opt/local/lib/pango/1.8.0/modules/??' $(sysconfdir)/pango/pango.modules cp -R /opt/local/lib/gtk-2.0 $(datarootdir)/lib cp -R /opt/local/lib/gdk-pixbuf-2.0 $(datarootdir)/lib + cp -R /opt/local/lib/pango $(datarootdir)/lib cp -R /opt/local/share/themes/Mac $(datadir)/themes cp -R ./osxapp/default/. $(gamedatadir)/themes/default $(INSTALL) ./png/marble_d.png $(gamedatadir)/themes/textures @@ -310,7 +312,12 @@ osxapp: all-recursive install install-recursive dylibbundler -of -b -x $(datarootdir)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/immodules/im-quartz.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libpixmap.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib + dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-arabic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib + dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-coretext.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib + dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-fc.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib + dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-indic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib find ./XBoard.app -name '*.a' -print0 | xargs -0 rm + find ./XBoard.app -name '*.la' -print0 | xargs -0 rm rm -r $(datarootdir)/lib/gtk-2.0/include rm -r $(datarootdir)/share/applications rm $(datarootdir)/share/info/dir diff --git a/osxapp/XBoard.gtklauncher b/osxapp/XBoard.gtklauncher index d448c4e..2946412 100755 --- a/osxapp/XBoard.gtklauncher +++ b/osxapp/XBoard.gtklauncher @@ -38,7 +38,9 @@ export GTK_PATH="$bundle_lib/gtk-2.0/2.10.0" export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules" # Pango path no longer required - 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" # Fix the gegl path issue export GEGL_PATH="$bundle_lib/gegl-0.2" diff --git a/osxapp/pango.modules b/osxapp/pango.modules deleted file mode 100644 index fcf6a1e..0000000 --- a/osxapp/pango.modules +++ /dev/null @@ -1,5 +0,0 @@ -# Pango Modules file -# Automatically generated file, do not edit -# -# -[pango] -- 1.7.0.4