[Silgraphite-cvs] silgraphite/contrib/pangomod Makefile.am,1.5,1.6 README,1.3,1.4 module.diff,1.1,1.2

[<sil...@li...>]

Update of /cvsroot/silgraphite/silgraphite/contrib/pangomod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17169

Modified Files:
	Makefile.am README module.diff 
Log Message:

change module patch to be for base pango dir
update build instructions - thanks Greg
install module to x.x.0 by default


Index: Makefile.am
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	25 Oct 2004 22:41:30 -0000	1.5
+++ Makefile.am	27 Oct 2004 17:00:13 -0000	1.6
@@ -14,7 +14,10 @@
 	
 EXTRA_DIST += $(top_srcdir)/*.h
 
-moduledir = $(libdir)/silgraphite/pango/$(PANGO_MODULE_VERSION)
+major=$(shell echo ${PANGO_MODULE_VERSION} | sed -e 's/\(^[0-9]*\)\.[0-9]*\.[0-9]*$$/\1/')
+minor=$(shell echo ${PANGO_MODULE_VERSION} | sed -e 's/^[0-9]*\.\([0-9]*\)\.[0-9]*$$/\1/')
+
+moduledir = $(libdir)/silgraphite/pango/$(major).$(minor).0
 module_LTLIBRARIES = pango-silgraphite-fc.la
 
 silgraphite_fc_sources = silgraphite-fc.c GrTextSrc.cpp \

Index: README
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	25 Oct 2004 18:10:57 -0000	1.3
+++ README	27 Oct 2004 17:00:13 -0000	1.4
@@ -1,20 +1,17 @@
 Patches
 -------
 
-pango.diff is a patch for pango to allow it to use a module/engine declared
-as covering PANGO_SCRIPT_PREFERRED before any other matching engine.
-This means that if the pango-silgraphite module is installed then pango
-can check if the font is a graphite font and hence use the graphite shaper
-otherwise it will fallback to what it would normally have used.
-It ought to work on pango/win32 as well though that is untested. However,
-the graphite module is currently only expected to work on X11.
-
-Some debug code needs removed before I submit it.
-
-module.diff has debug removed, apply instead of pango.diff
-_not_ as well as.
+module.diff and script.diff are patch for pango to allow it to use a
+module/engine declared as covering PANGO_SCRIPT_PREFERRED before any
+other matching engine. This means that if the pango-silgraphite module
+is installed then pango can check if the font is a graphite font and
+hence use the graphite shaper otherwise it will fallback to what it
+would normally have used. It ought to work on pango/win32 as well though
+that is untested. However, the graphite module is currently only
+expected to work on X11.
 
-script.diff is the second part of the pango patch.
+pango.diff is an alternative to module.diff which includes extra debug
+trace code.
 
 fontconfig.diff is a patch for fontconfig to allow it to detect fonts
 with the Silf table and cache that information.
@@ -38,7 +35,7 @@
 Build and install silgraphite to <prefix>
 Build and install pangographite to <prefix>
 
-Finally ou need to create a file ~/.pangorc which has
+Finally you need to create a file ~/.pangorc which has
 [Pango]
 ModulesPath=<path to installed pangographite module>:<path to installed pango modules>
 
@@ -49,4 +46,5 @@
 Then run pango-querymodules > <prefix>/etc/pango/pango.modules
 e.g. pango-querymodules > /opt/graphite/etc/pango/pango.modules
 
-Now when you run a program - try testtext, it should start using graphite if it can.
+Now when you run a program - try testtext, it should start using
+graphite if it can.

Index: module.diff
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/module.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- module.diff	12 Apr 2004 10:24:24 -0000	1.1
+++ module.diff	27 Oct 2004 17:00:13 -0000	1.2
@@ -1,10 +1,10 @@
-Index: modules.c
+Index: pango/modules.c
 ===================================================================
 RCS file: /cvs/gnome/pango/pango/modules.c,v
 retrieving revision 1.47
 diff -u -w -r1.47 modules.c
---- modules.c	12 Nov 2003 08:42:43 -0000	1.47
-+++ modules.c	28 Feb 2004 17:21:50 -0000
+--- pango/modules.c	12 Nov 2003 08:42:43 -0000	1.47
++++ pango/modules.c	28 Feb 2004 17:21:50 -0000
 @@ -633,6 +633,10 @@
  {
    PangoMapEntry *entry = NULL;