From 5610a08ef759d2b056c771be884ceb9c0ed5583a Mon Sep 17 00:00:00 2001 From: Joshua Pettus Date: Thu, 28 Jan 2016 17:58:00 -0500 Subject: [PATCH] Remove added pango modules to coincide with macports package Macports got rid of the +builtin_modules variant and made that the default port. (I assume macports, maybe it was a gtk change) This is great for installation simplicity, but messes up my build script which was set to use the former base pango install. Hopefully they stick with this. --- Makefile.am | 9 --------- osxapp/XBoard.gtklauncher | 5 ----- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 09fa6fd..7378e7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -248,7 +248,6 @@ macportsprefix = $(shell which port | sed s/[/]bin[/]port//) $(MKDIR_P) $(datarootdir)/bin $(MKDIR_P) $(datarootdir)/lib $(MKDIR_P) $(sysconfdir)/gtk-2.0 - $(MKDIR_P) $(sysconfdir)/pango $(MKDIR_P) $(datadir)/themes $(MKDIR_P) $(datadir)/gtk-engines $(MKDIR_P) $(gamedatadir)/themes @@ -295,11 +294,8 @@ macportsprefix = $(shell which port | sed s/[/]bin[/]port//) $(INSTALL) ./osxapp/launcher_rc $(datarootdir)/ $(INSTALL) $(macportsprefix)/etc/gtk-2.0/im-multipress.conf $(sysconfdir)/gtk-2.0 $(INSTALL) ./osxapp/gtkrc $(sysconfdir)/gtk-2.0/gtkrc - sed -e '/ModuleFiles = .*\/etc\/pango\/pango.modules/d' <$(macportsprefix)/etc/pango/pangorc >$(sysconfdir)/pango/pangorc - sed -e 's?$(macportsprefix)/lib/pango/1.8.0/modules/??' <$(macportsprefix)/etc/pango/pango.modules >$(sysconfdir)/pango/pango.modules cp -R $(macportsprefix)/lib/gtk-2.0 $(datarootdir)/lib cp -R $(macportsprefix)/lib/gdk-pixbuf-2.0 $(datarootdir)/lib - cp -R $(macportsprefix)/lib/pango $(datarootdir)/lib cp -R $(macportsprefix)/share/themes/Mac $(datadir)/themes cp -R ./osxapp/gtk2-themes/Mac/gtk-2.0 $(datadir)/themes/Mac cp -R ./osxapp/themes/default/. $(gamedatadir)/themes/default @@ -317,12 +313,7 @@ endif 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/gtk-2.0/2.10.0/engines/libmurrine.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 2895275..33333ed 100755 --- a/osxapp/XBoard.gtklauncher +++ b/osxapp/XBoard.gtklauncher @@ -37,11 +37,6 @@ 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" -# Pango path no longer required -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" -- 1.7.0.4