You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
118 lines
3.9 KiB
118 lines
3.9 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2009-09-08 17:43:10 +0200 |
|
+++ Makefile.in 2009-09-10 20:35:07 +0200 |
|
@@ -324,7 +324,7 @@ |
|
top_build_prefix = @top_build_prefix@ |
|
top_builddir = @top_builddir@ |
|
top_srcdir = @top_srcdir@ |
|
-SUBDIRS = pango modules pango-view examples docs tools tests |
|
+SUBDIRS = pango modules pango-view docs tools tests |
|
EXTRA_DIST = \ |
|
autogen.sh \ |
|
pango.pc.in \ |
|
Index: pango.pc.in |
|
--- pango.pc.in.orig 2009-02-07 00:49:34 +0100 |
|
+++ pango.pc.in 2009-09-10 20:35:07 +0200 |
|
@@ -10,4 +10,4 @@ |
|
Version: @VERSION@ |
|
Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0 |
|
Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ |
|
-Cflags: -I${includedir}/pango-1.0 |
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir} |
|
Index: pango/Makefile.in |
|
--- pango/Makefile.in.orig 2009-09-08 17:43:09 +0200 |
|
+++ pango/Makefile.in 2009-09-10 20:35:42 +0200 |
|
@@ -535,7 +535,7 @@ |
|
$(X_CFLAGS) |
|
|
|
BUILT_SOURCES = pango-enum-types.h pango-enum-types.c pango-features.h |
|
-pangoincludedir = $(includedir)/pango-1.0/pango |
|
+pangoincludedir = $(includedir)/pango |
|
@OS_WIN32_FALSE@libm = -lm |
|
|
|
# ------------------- libpango ------------------- |
|
@@ -619,10 +619,7 @@ |
|
libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_5) |
|
libpangox_1_0_la_LIBADD = \ |
|
libpango-$(PANGO_API_VERSION).la \ |
|
- $(INCLUDED_X_MODULES) \ |
|
- $(GLIB_LIBS) \ |
|
- $(X_LIBS) \ |
|
- $(X_EXTRA_LIBS) |
|
+ $(INCLUDED_X_MODULES) |
|
|
|
libpangox_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \ |
|
$(INCLUDED_X_MODULES) $(am__append_6) |
|
@@ -652,10 +649,7 @@ |
|
libpangoft2_1_0_la_LIBADD = \ |
|
opentype/libharfbuzz.la \ |
|
libpango-$(PANGO_API_VERSION).la \ |
|
- $(INCLUDED_FC_MODULES) \ |
|
- $(GLIB_LIBS) \ |
|
- $(FREETYPE_LIBS) \ |
|
- $(libm) |
|
+ $(INCLUDED_FC_MODULES) |
|
|
|
libpangoft2_1_0_la_DEPENDENCIES = opentype/libharfbuzz.la \ |
|
libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) \ |
|
@@ -680,12 +674,7 @@ |
|
$(am__append_15) |
|
libpangoxft_1_0_la_LIBADD = \ |
|
libpangoft2-$(PANGO_API_VERSION).la \ |
|
- libpango-$(PANGO_API_VERSION).la \ |
|
- $(GLIB_LIBS) \ |
|
- $(X_LIBS) \ |
|
- $(XFT_LIBS) \ |
|
- $(FREETYPE_LIBS) \ |
|
- $(libm) |
|
+ libpango-$(PANGO_API_VERSION).la |
|
|
|
libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la \ |
|
libpango-$(PANGO_API_VERSION).la $(am__append_16) |
|
@@ -699,7 +688,7 @@ |
|
libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) \ |
|
$(am__append_20) $(am__append_30) |
|
libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la \ |
|
- $(GLIB_LIBS) $(CAIRO_LIBS) $(libm) $(am__append_22) \ |
|
+ $(CAIRO_LIBS) $(libm) $(am__append_22) \ |
|
$(am__append_25) $(am__append_31) |
|
libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la \ |
|
$(am__append_21) $(am__append_23) $(am__append_26) |
|
Index: pango/querymodules.c |
|
--- pango/querymodules.c.orig 2009-08-28 19:10:40 +0200 |
|
+++ pango/querymodules.c 2009-09-10 20:35:07 +0200 |
|
@@ -240,7 +240,6 @@ |
|
path = pango_config_key_get ("Pango/ModulesPath"); |
|
if (!path) |
|
path = g_build_filename (pango_get_lib_subdirectory (), |
|
- MODULE_VERSION, |
|
"modules", |
|
NULL); |
|
|
|
Index: pangoft2.pc.in |
|
--- pangoft2.pc.in.orig 2009-02-07 00:49:34 +0100 |
|
+++ pangoft2.pc.in 2009-09-10 20:35:07 +0200 |
|
@@ -8,4 +8,4 @@ |
|
Version: @VERSION@ |
|
Requires: pango freetype2 fontconfig |
|
Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ |
|
-Cflags: -I${includedir}/pango-1.0 |
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir} |
|
Index: pangox.pc.in |
|
--- pangox.pc.in.orig 2009-02-07 00:49:34 +0100 |
|
+++ pangox.pc.in 2009-09-10 20:35:07 +0200 |
|
@@ -8,4 +8,4 @@ |
|
Version: @VERSION@ |
|
Requires: pango |
|
Libs: -L${libdir} -lpangox-@PANGO_API_VERSION@ @X_LIBS@ |
|
-Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@ |
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir} @X_CFLAGS@ |
|
Index: pangoxft.pc.in |
|
--- pangoxft.pc.in.orig 2009-02-07 00:49:34 +0100 |
|
+++ pangoxft.pc.in 2009-09-10 20:35:07 +0200 |
|
@@ -8,4 +8,4 @@ |
|
Version: @VERSION@ |
|
Requires: pango pangoft2 xft |
|
Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ |
|
-Cflags: -I${includedir}/pango-1.0 |
|
+Cflags: -I${includedir}/pango-1.0 -I${includedir}
|
|
|