- updated to 1.22.3

[packages/crossmingw32-pango.git] / pango-arch_confdir.patch

diff --git a/pango-arch_confdir.patch b/pango-arch_confdir.patch
index 0502bf57c0af5124901c24146e4b88d3511cde33..000f75e823dc8b697320ff0aa5586adb7fc5d96f 100644 (file)
--- a/pango-arch_confdir.patch
+++ b/pango-arch_confdir.patch
@@ -1,38 +1,23 @@
-diff -urN pango-1.16.0/configure.in pango-1.16.0.new/configure.in
---- pango-1.16.0/configure.in  2007-02-26 20:13:10.000000000 +0100
-+++ pango-1.16.0.new/configure.in      2007-03-10 14:33:28.000000000 +0100
-@@ -282,6 +282,10 @@
- AC_SUBST(WIN32_LIBS)
- AM_CONDITIONAL(HAVE_WIN32, $have_win32) 
- 
-+ARCH=${CC%%-*}
-+AC_SUBST(ARCH)
-+AC_DEFINE_UNQUOTED(ARCH, "${ARCH}", [Architecture])
-+
- # Ensure MSVC-compatible struct packing convention is used when
- # compiling for Win32 with gcc.
- # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
-diff -urN pango-1.16.0/modules/Makefile.am pango-1.16.0.new/modules/Makefile.am
---- pango-1.16.0/modules/Makefile.am   2007-01-03 09:15:03.000000000 +0100
-+++ pango-1.16.0.new/modules/Makefile.am       2007-03-10 14:35:45.000000000 +0100
+--- pango-1.18.0/modules/Makefile.am.orig      2007-07-05 23:30:28.000000000 +0200
++++ pango-1.18.0/modules/Makefile.am   2007-08-26 20:39:17.982104313 +0200
 @@ -28,15 +28,15 @@
  
- install-data-local: $(top_builddir)/pango/pango-querymodules
-       @if $(RUN_QUERY_MODULES_TEST) ; then                            \
+ install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
+       @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then    \
 -        echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\&      \
-+        echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) \&\&      \
-         $(top_builddir)/pango/pango-querymodules                      \
++        echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\&    \
+         $(top_builddir)/pango/pango-querymodules$(EXEEXT)             \
 -              \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ;        \
 -        $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango &&             \
-+              \> $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ;        \
-+        $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) &&             \
-         $(top_builddir)/pango/pango-querymodules                      \
++              \> $(DESTDIR)$(sysconfdir)/pango.modules ;      \
++        $(mkinstalldirs) $(DESTDIR)$(sysconfdir) &&           \
+         $(top_builddir)/pango/pango-querymodules$(EXEEXT)             \
 -              > $(DESTDIR)$(sysconfdir)/pango/pango.modules ;         \
-+              > $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ;         \
++              > $(DESTDIR)$(sysconfdir)/pango.modules ;               \
        else                                                            \
          echo "***" ;                                                  \
 -        echo "*** Warning: $(sysconfdir)/pango/pango.modules" ;       \
-+        echo "*** Warning: $(sysconfdir)/pango-$(ARCH)/pango.modules" ;       \
++        echo "*** Warning: $(sysconfdir)/pango.modules" ;     \
          echo "*** not created" ;                                      \
          echo "*** Generate this file on the target system" ;          \
          echo "*** using pango-querymodules" ;                         \
@@ -41,43 +26,40 @@ diff -urN pango-1.16.0/modules/Makefile.am pango-1.16.0.new/modules/Makefile.am
  
  uninstall-local:
 -      $(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules
-+      $(RM) $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules
++      $(RM) $(DESTDIR)$(sysconfdir)/pango.modules
  
  pango.modules:                                                \
        $(SUBDIRS)                                      \
-diff -urN pango-1.16.0/pango/Makefile.am pango-1.16.0.new/pango/Makefile.am
---- pango-1.16.0/pango/Makefile.am     2007-02-18 18:10:43.000000000 +0100
-+++ pango-1.16.0.new/pango/Makefile.am 2007-03-10 14:53:50.000000000 +0100
+--- pango-1.16.2.orig/pango/Makefile.am        2007-04-12 23:54:04.006011079 +0200
++++ pango-1.16.2/pango/Makefile.am     2007-04-12 23:54:27.631054049 +0200
 @@ -158,7 +158,7 @@
  if HAVE_X
  pangoinclude_HEADERS += pangox.h
  lib_LTLIBRARIES += libpangox-1.0.la
 -aliasdir = $(sysconfdir)/pango
-+aliasdir = $(sysconfdir)/pango-$(ARCH)
++aliasdir = $(sysconfdir)
  alias_DATA = pangox.aliases
  endif
  
-diff -urN pango-1.16.0/pango/pango-utils.c pango-1.16.0.new/pango/pango-utils.c
---- pango-1.16.0/pango/pango-utils.c   2007-01-23 00:41:43.000000000 +0100
-+++ pango-1.16.0.new/pango/pango-utils.c       2007-03-10 14:37:03.000000000 +0100
+--- pango-1.16.2.orig/pango/pango-utils.c      2007-04-12 23:54:03.899351741 +0200
++++ pango-1.16.2/pango/pango-utils.c   2007-04-12 23:54:27.631054049 +0200
 @@ -690,7 +690,7 @@
  
    return result;
  #else
 -  return SYSCONFDIR "/pango";
-+  return SYSCONFDIR "/pango-" ARCH;
++  return SYSCONFDIR;
  #endif
  }
  
-diff -urN pango-1.16.0/pango/pangox-fontmap.c pango-1.16.0.new/pango/pangox-fontmap.c
---- pango-1.16.0/pango/pangox-fontmap.c        2007-01-23 00:41:43.000000000 +0100
-+++ pango-1.16.0.new/pango/pangox-fontmap.c    2007-03-10 14:38:04.000000000 +0100
+--- pango-1.16.2.orig/pango/pangox-fontmap.c   2007-04-12 23:54:04.026009703 +0200
++++ pango-1.16.2/pango/pangox-fontmap.c        2007-04-12 23:54:27.634387153 +0200
 @@ -921,7 +921,7 @@
    int n;
  
    if (!files_str)
 -    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
-+    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango-" ARCH "/pangox.aliases");
++    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases");
  
    files = pango_split_file_list (files_str);