SOURCES (AC-branch): pango-arch_confdir.patch - update to 1.12.3

[glen]

Author: glen                         Date: Sun Mar 11 19:07:23 2007 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- update to 1.12.3

---- Files affected:
SOURCES:
   pango-arch_confdir.patch (1.1.4.1 -> 1.1.4.2) 

---- Diffs:

================================================================
Index: SOURCES/pango-arch_confdir.patch
diff -u SOURCES/pango-arch_confdir.patch:1.1.4.1 SOURCES/pango-arch_confdir.patch:1.1.4.2
--- SOURCES/pango-arch_confdir.patch:1.1.4.1	Tue Jun 27 16:32:38 2006
+++ SOURCES/pango-arch_confdir.patch	Sun Mar 11 20:07:17 2007
@@ -1,4 +1,3 @@
-diff -Nur pango-1.10.2/configure.in pango-1.10.2.arch_confdir/configure.in
 --- pango-1.10.2/configure.in	2005-11-29 05:28:16.000000000 +0000
 +++ pango-1.10.2.arch_confdir/configure.in	2005-12-10 16:57:38.000000000 +0000
 @@ -270,6 +270,10 @@
@@ -12,9 +11,8 @@
  #
  # Checks for Cairo
  #
-diff -Nur pango-1.10.2/modules/Makefile.am pango-1.10.2.arch_confdir/modules/Makefile.am
---- pango-1.10.2/modules/Makefile.am	2005-06-21 16:02:55.000000000 +0000
-+++ pango-1.10.2.arch_confdir/modules/Makefile.am	2005-12-10 16:57:38.000000000 +0000
+--- pango-1.12.3/modules/Makefile.am~	2007-03-11 20:47:10.000000000 +0200
++++ pango-1.12.3/modules/Makefile.am	2007-03-11 20:50:06.000000000 +0200
 @@ -28,15 +28,15 @@
  
  install-data-local: $(top_builddir)/pango/pango-querymodules
@@ -36,7 +34,15 @@
  	  echo "*** not created" ; 					\
  	  echo "*** Generate this file on the target system" ; 		\
  	  echo "*** using pango-querymodules" ; 			\
-diff -Nur pango-1.10.2/pango/pango-utils.c pango-1.10.2.arch_confdir/pango/pango-utils.c
+@@ -44,7 +44,7 @@
+ 	fi
+ 
+ uninstall-local:
+-	$(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
++	$(RM) $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules
+ 
+ pango.modules: $(top_builddir)/pango/pango-querymodules $(SUBDIRS)
+ 	@if find . -name '*.so' | grep 'so' > /dev/null ; then \
 --- pango-1.10.2/pango/pango-utils.c	2005-11-23 17:53:30.000000000 +0000
 +++ pango-1.10.2.arch_confdir/pango/pango-utils.c	2005-12-10 16:57:38.000000000 +0000
 @@ -672,7 +672,7 @@
@@ -48,7 +54,6 @@
  #endif
  }
  
-diff -Nur pango-1.10.2/pango/pangox-fontmap.c pango-1.10.2.arch_confdir/pango/pangox-fontmap.c
 --- pango-1.10.2/pango/pangox-fontmap.c	2005-07-22 19:05:45.000000000 +0000
 +++ pango-1.10.2.arch_confdir/pango/pangox-fontmap.c	2005-12-10 16:58:49.000000000 +0000
 @@ -30,6 +30,8 @@
@@ -69,8 +74,8 @@
  
    files = pango_split_file_list (files_str);
    
---- pango-1.10.2/pango/Makefile.am	2006-02-03 06:42:33.000000000 +0000
-+++ pango-1.10.2.arch_confdir/pango/Makefile.am	2006-06-27 14:28:44.000000000 +0000
+--- pango-1.12.3/pango/Makefile.am~	2006-02-03 08:42:33.000000000 +0200
++++ pango-1.12.3/pango/Makefile.am	2007-03-11 20:55:00.000000000 +0200
 @@ -148,7 +148,7 @@
  if HAVE_X
  pangoinclude_HEADERS += pangox.h
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pango-arch_confdir.patch?r1=1.1.4.1&r2=1.1.4.2&f=u