From de349ab60d9161db3ed215587aba46a0b7bd3710 Mon Sep 17 00:00:00 2001 From: aflinta Date: Thu, 12 Apr 2007 22:02:47 +0000 Subject: [PATCH] - up for version 1.16.2 Changed files: pango-arch_confdir.patch -> 1.3 --- pango-arch_confdir.patch | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pango-arch_confdir.patch b/pango-arch_confdir.patch index 0502bf5..50439df 100644 --- a/pango-arch_confdir.patch +++ b/pango-arch_confdir.patch @@ -1,6 +1,6 @@ -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 +diff -urN pango-1.16.2.orig/configure.in pango-1.16.2/configure.in +--- pango-1.16.2.orig/configure.in 2007-04-12 23:54:04.149334562 +0200 ++++ pango-1.16.2/configure.in 2007-04-12 23:54:27.631054049 +0200 @@ -282,6 +282,10 @@ AC_SUBST(WIN32_LIBS) AM_CONDITIONAL(HAVE_WIN32, $have_win32) @@ -12,21 +12,21 @@ diff -urN pango-1.16.0/configure.in pango-1.16.0.new/configure.in # 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 +diff -urN pango-1.16.2.orig/modules/Makefile.am pango-1.16.2/modules/Makefile.am +--- pango-1.16.2.orig/modules/Makefile.am 2007-04-12 23:54:05.089269961 +0200 ++++ pango-1.16.2/modules/Makefile.am 2007-04-12 23:57:47.497317696 +0200 @@ -28,15 +28,15 @@ - install-data-local: $(top_builddir)/pango/pango-querymodules + install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT) @if $(RUN_QUERY_MODULES_TEST) ; then \ - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ + echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango-$(ARCH) \&\& \ - $(top_builddir)/pango/pango-querymodules \ + $(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 \ + $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ - > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ + > $(DESTDIR)$(sysconfdir)/pango-$(ARCH)/pango.modules ; \ else \ @@ -45,9 +45,9 @@ diff -urN pango-1.16.0/modules/Makefile.am pango-1.16.0.new/modules/Makefile.am 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 +diff -urN pango-1.16.2.orig/pango/Makefile.am pango-1.16.2/pango/Makefile.am +--- 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 @@ -57,9 +57,9 @@ diff -urN pango-1.16.0/pango/Makefile.am pango-1.16.0.new/pango/Makefile.am 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 +diff -urN pango-1.16.2.orig/pango/pango-utils.c pango-1.16.2/pango/pango-utils.c +--- 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; @@ -69,9 +69,9 @@ diff -urN pango-1.16.0/pango/pango-utils.c pango-1.16.0.new/pango/pango-utils.c #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 +diff -urN pango-1.16.2.orig/pango/pangox-fontmap.c pango-1.16.2/pango/pangox-fontmap.c +--- 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; -- 2.44.0